mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 09:04:55 +00:00
remove conflict garbage
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3660 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
13043313fa
commit
09d50dbe9d