diff options
| author | Damon Chaplin <damon@src.gnome.org> | 2000-10-21 23:41:19 +0800 |
|---|---|---|
| committer | Damon Chaplin <damon@src.gnome.org> | 2000-10-21 23:41:19 +0800 |
| commit | b00d886cf875101c4e4a4ddcf381bd10138af1c0 (patch) | |
| tree | b825e3569a3f5dcc6dd7b5a686faff96b01d45f8 | |
| parent | dbf54684fc3b1d024253a7415d75d076a1bf4cc9 (diff) | |
| download | gsoc2013-evolution-b00d886cf875101c4e4a4ddcf381bd10138af1c0.tar.gz gsoc2013-evolution-b00d886cf875101c4e4a4ddcf381bd10138af1c0.tar.zst gsoc2013-evolution-b00d886cf875101c4e4a4ddcf381bd10138af1c0.zip | |
removed conflict indicator
svn path=/trunk/; revision=6098
| -rw-r--r-- | calendar/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 4928397f0b..6950b626ca 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -114,7 +114,6 @@ to 1 rather than 0, so if you move the hpane you'll see the date navigator. ->>>>>>> 1.631 2000-10-19 Jesse Pavel <jpavel@helixcode.com> * gui/event-editor.[ch]: added a public function which causes the |