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:
Dan Williams 2008-03-11 16:42:17 +00:00
parent 60da632512
commit c39a038acd

View file

@ -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