gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove old conflict marker

Browse source
This commit is contained in:
Alexander Larsson 2006-02-28 12:40:51 +00:00
parent f34f0e5309
commit 11fc1faa32
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

@ -1049,7 +1049,6 @@
Patch by Jaap A. Haitsma
>>>>>>> 1.6730
2005-12-10 Martin Wehner <martin.wehner@gmail.com>
* src/file-manager/fm-directory-view.c: