diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-11 08:37:05 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2000-07-11 08:37:05 +0800 |
| commit | 592a45a9c07d92648ca2e791fa04e23ebd1afe62 (patch) | |
| tree | 972fd230991f88db37a6164e96add3f8f0a0b2dd | |
| parent | cc233e954b5fe6be038ceb3e0239158bff74e3b3 (diff) | |
| download | gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.gz gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.tar.zst gsoc2013-evolution-592a45a9c07d92648ca2e791fa04e23ebd1afe62.zip | |
Remove conflict marks.
svn path=/trunk/; revision=4081
| -rw-r--r-- | doc/ChangeLog | 8 | ||||
| -rw-r--r-- | help/ChangeLog | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 259070da01..bcca8be7e5 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -34,7 +34,6 @@ * C/fig/config-mail.png: changed filename from config-prefs.png - <<<<<<< ChangeLog 2000-06-01 Aaron Weber <aaron@helixcode.com> * C/config-prefs.sgml: filename was wrong, altered. @@ -59,7 +58,6 @@ * C/fig/filter-new-fig.png: same * C/fig/config-camel.png: same -======= 2000-06-01 Dan Winship <danw@helixcode.com> * Makefile.am: recurse into the C directory @@ -69,7 +67,6 @@ (http://www.gnome.org/gdp/) set up on your machine, but won't make the build fail if you don't. ->>>>>>> 1.9 2000-05-29 Aaron Weber <aaron@helixcode.com> * C/usage-contact.sgml: incorporated kevins notes. @@ -208,8 +205,3 @@ 2000-02-25 Federico Mena Quintero <federico@helixcode.com> * calendar.sgml: New file for the Evolution calendaring white paper. - - - - -
\ No newline at end of file diff --git a/help/ChangeLog b/help/ChangeLog index 259070da01..bcca8be7e5 100644 --- a/help/ChangeLog +++ b/help/ChangeLog @@ -34,7 +34,6 @@ * C/fig/config-mail.png: changed filename from config-prefs.png - <<<<<<< ChangeLog 2000-06-01 Aaron Weber <aaron@helixcode.com> * C/config-prefs.sgml: filename was wrong, altered. @@ -59,7 +58,6 @@ * C/fig/filter-new-fig.png: same * C/fig/config-camel.png: same -======= 2000-06-01 Dan Winship <danw@helixcode.com> * Makefile.am: recurse into the C directory @@ -69,7 +67,6 @@ (http://www.gnome.org/gdp/) set up on your machine, but won't make the build fail if you don't. ->>>>>>> 1.9 2000-05-29 Aaron Weber <aaron@helixcode.com> * C/usage-contact.sgml: incorporated kevins notes. @@ -208,8 +205,3 @@ 2000-02-25 Federico Mena Quintero <federico@helixcode.com> * calendar.sgml: New file for the Evolution calendaring white paper. - - - - -
\ No newline at end of file |