From ef66bda22391f2ef39a6d7d5688c0e3a98c3b841 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Tue, 9 Oct 2007 13:35:25 +0000 Subject: [PATCH] Fix conflicts --- ChangeLog | 8 -------- PATCHSETS | 4 ---- 2 files changed, 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6994839cb..65eab4da1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,19 +3,11 @@ * src/gtk/about.c center the about window -<<<<<<< ChangeLog -2007-10-09 [iwkse] 3.0.2cvs42 - - * src/gtk/about.c - center the about window - -======= 2007-10-09 [paul] 3.0.2cvs42 * src/prefs_toolbar.c fix icon selector window on maemo ->>>>>>> 1.396.2.2087 2007-10-09 [paul] 3.0.2cvs41 * src/messageview.c diff --git a/PATCHSETS b/PATCHSETS index a4d28cfac..f2208065a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2954,9 +2954,5 @@ ( cvs diff -u -r 1.60.2.100 -r 1.60.2.101 src/addressbook.c; cvs diff -u -r 1.13.2.13 -r 1.13.2.14 src/addritem.c; cvs diff -u -r 1.12.2.11 -r 1.12.2.12 src/addritem.h; cvs diff -u -r 1.14.2.29 -r 1.14.2.30 src/editaddress.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/editaddress_other_attributes_ldap.h; cvs diff -u -r 1.22.2.17 -r 1.22.2.18 src/addrbook.c; cvs diff -u -r 1.155.2.77 -r 1.155.2.78 src/Makefile.am; ) > 3.0.2cvs39.patchset ( cvs diff -u -r 1.9.2.42 -r 1.9.2.43 src/common/defs.h; ) > 3.0.2cvs40.patchset ( cvs diff -u -r 1.94.2.154 -r 1.94.2.155 src/messageview.c; ) > 3.0.2cvs41.patchset -<<<<<<< PATCHSETS -( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c; ) > 3.0.2cvs42.patchset -======= ( cvs diff -u -r 1.30.2.44 -r 1.30.2.45 src/prefs_toolbar.c; ) > 3.0.2cvs42.patchset ->>>>>>> 1.1.2.2966 ( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c; ) > 3.0.2cvs43.patchset -- 2.25.1