openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix conflict && debian error

This commit is contained in:
jzxc95 2021-10-15 20:29:12 +08:00
parent 4b46a52c92
commit 2e09adefdb
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/control vendored
View File

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

2
src/frontend/netdetails/netdetail.h
View File

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