From 18d70d17c2d89b7c6f2f40a48e3bda14fbf97531 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Mon, 30 Mar 2009 17:16:14 +0000 Subject: [PATCH] Fix conflict --- PATCHSETS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/PATCHSETS b/PATCHSETS index 4da5a2872..ce6f671e6 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3764,11 +3764,8 @@ ( cvs diff -u -r 1.43.2.107 -r 1.43.2.108 src/toolbar.c; cvs diff -u -r 1.36.2.168 -r 1.36.2.169 src/common/utils.c; ) > 3.7.1cvs22.patchset ( cvs diff -u -r 1.654.2.3830 -r 1.654.2.3831 configure.ac; ) > 3.7.1cvs23.patchset ( cvs diff -u -r 1.96.2.217 -r 1.96.2.218 src/textview.c; ) > 3.7.1cvs24.patchset -<<<<<<< PATCHSETS -( cvs diff -u -r 1.654.2.3833 -r 1.654.2.3834 configure.ac; ) > 3.7.1cvs26.patchset -======= ( cvs diff -u -r 1.101.2.60 -r 1.101.2.61 src/news.c; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/etpan/nntp-thread.c; ) > 3.7.1cvs25.patchset ->>>>>>> 1.1.2.3777 +( cvs diff -u -r 1.654.2.3833 -r 1.654.2.3834 configure.ac; ) > 3.7.1cvs26.patchset ( cvs diff -u -r 1.179.2.244 -r 1.179.2.245 src/imap.c; ) > 3.7.1cvs27.patchset ( cvs diff -u -r 1.213.2.191 -r 1.213.2.192 src/folder.c; ) > 3.7.1cvs28.patchset ( cvs diff -u -r 1.179.2.245 -r 1.179.2.246 src/imap.c; ) > 3.7.1cvs29.patchset -- 2.25.1