fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 01:47:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove conflict garbage

Browse source 
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3660 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-05-12 17:12:06 +00:00
parent 13043313fa
commit 09d50dbe9d
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -136,7 +136,6 @@
* system-settings/src/Makefile.am: Add sha1[ch] to build.
>>>>>>> .r3644
2008-05-07 Dan Williams <dcbw@redhat.com>
* system-settings/plugins/keyfile/reader.c