From 2e09adefdb58a199fb778407e848d997bc9bdf2c Mon Sep 17 00:00:00 2001
From: jzxc95 <907297917@qq.com>
Date: Fri, 15 Oct 2021 20:29:12 +0800
Subject: [PATCH] fix conflict && debian error

---
 debian/control                      | 1 +
 debian/rules                        | 2 +-
 src/frontend/netdetails/netdetail.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index c34468cd..1041c26e 100644
--- a/debian/control
+++ b/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),
diff --git a/debian/rules b/debian/rules
index 9454d51a..2da18dca 100755
--- a/debian/rules
+++ b/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
 
diff --git a/src/frontend/netdetails/netdetail.h b/src/frontend/netdetails/netdetail.h
index 950670af..396788a8 100644
--- a/src/frontend/netdetails/netdetail.h
+++ b/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