Fix conflicts

[claws.git] / PATCHSETS

diff --git a/PATCHSETS b/PATCHSETS
index d60fe64250511f1dd358936e8b9d77dd4d0c5f11..f2208065a1d2af347c4cb05f684468d49dd91acb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2955,3 +2955,4 @@
 ( 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
 ( cvs diff -u -r 1.30.2.44 -r 1.30.2.45 src/prefs_toolbar.c;  ) > 3.0.2cvs42.patchset
+( cvs diff -u -r 1.4.2.52 -r 1.4.2.53 src/gtk/about.c;  ) > 3.0.2cvs43.patchset