diff options
| author | Anders Carlsson <andersca@src.gnome.org> | 2002-03-13 16:00:25 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2002-03-13 16:00:25 +0000 |
| commit | ced48ddee3a341cb6702195ccf1c8608cd2958b5 (patch) | |
| tree | 81de0712934751bc96641d5455daf12cff1af8c8 | |
| parent | c3827ca4bc4ab3b869caf8df50a286da8c14974d (diff) | |
| download | nautilus-ced48ddee3a341cb6702195ccf1c8608cd2958b5.tar.gz | |
Remove conflict markers
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -25,7 +25,6 @@ Fix a crash where the music view would crash after playing the last song of a list. Correct indentation. ->>>>>>> 1.5131 2002-03-11 Anders Carlsson <andersca@gnu.org> * libnautilus-private/Makefile.am: |