oops

diff --git a/ChangeLog-gtk2 b/ChangeLog-gtk2
index a1558ad17bb66bc9ee6811e9fe626151280c3dfd..b7b1e0d720f8b4b75893bc9e0ccd124801960c8f 100644 (file)
--- a/ChangeLog-gtk2
+++ b/ChangeLog-gtk2
@@ -48,7 +48,6 @@
        * src/textview.c
                variable names messed up
 
->>>>>>> 1.1.2.19
 2004-01-17 Colin Leroy <colin@colino.net>
        * src/addr_compl.c
                Fix completion address too thin