mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 04:28:00 +02:00
fix mis-merge
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3420 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
60da632512
commit
c39a038acd
1 changed files with 0 additions and 1 deletions
|
|
@ -35,7 +35,6 @@
|
|||
* introspection/nm-ppp-manager.xml: Make NeedSecrets method async, return only
|
||||
username and password.
|
||||
|
||||
>>>>>>> .r3418
|
||||
2008-03-10 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-device.c
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue