From 3567dff72453d676f086cbab86d396f84ff9ea24 Mon Sep 17 00:00:00 2001
From: Martin Baulig <martin@src.gnome.org>
Date: Sun, 28 Feb 1999 11:26:02 +0000
Subject: Remove a CVS conflict marker.

svn path=/trunk/; revision=709
---
 macros/ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'macros')

diff --git a/macros/ChangeLog b/macros/ChangeLog
index 886fb07b5a..cbeb877758 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -2,6 +2,7 @@
 
 	* gnome-x-checks.m4 : Require at least gtk+ 1.2 (pointless getting
 	bug reports with an old glib/gtk/gdk set..)
+
 1999-02-25  Martin Baulig  <martin@home-of-linux.org>
 
 	* gnome-libgtop-checks.m4: Require LibGTop >= 1.0.0.
@@ -94,7 +95,6 @@ Tue Feb 16 19:35:42 1999  Owen Taylor  <otaylor@redhat.com>
 
 	* need-declaration.m4, gnome-support.m4: Fixed the scandir detection.
 
->>>>>>> 1.149
 1998-12-22  Jeff Garzik  <jgarzik@pobox.com>
 
 	* gnome.m4:  Added and exported GNOME_APPLET_LIBS.
-- 
cgit