fix conflict && debian error

debian/control

@@ -23,6 +23,7 @@ Rules-Requires-Root: no
 Homepage: https://github.com/ukui/kylin-nm
 Vcs-Git: https://github.com/ukui/kylin-nm.git
 Vcs-Browser: https://github.com/ukui/kylin-nm
+
 Package: kylin-nm
 Architecture: any
 Depends: network-manager (>=1.2.6),

debian/rules

@@ -30,5 +30,5 @@ override_dh_auto_build:
 	dh_auto_build -- $(MAKE_OPTS)
 
 override_dh_shlibdeps:
-        dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 

src/frontend/netdetails/netdetail.h

@@ -129,9 +129,9 @@ private:
 private slots:
     void on_btnConfirm_clicked();
     void on_btnForget_clicked();
+    void onPaletteChanged();
 
 signals:
     void detailPageClose(bool on);
-    void onPaletteChanged();
 };
 #endif // NETDETAIL_H