diff options
| author | Martin Baulig <martin@src.gnome.org> | 1999-02-28 11:26:02 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 1999-02-28 11:26:02 +0000 |
| commit | 3096482697c773068ae6c8924c3e21fa4366e40b (patch) | |
| tree | 802e97fe59aeaa76188d3a42718861fd34c13787 | |
| parent | 68726dfdfc5f145221e0e3e77e3db290dd7cfc3a (diff) | |
| download | gnome-common-3096482697c773068ae6c8924c3e21fa4366e40b.tar.gz | |
Remove a CVS conflict marker.
svn path=/trunk/; revision=666
| -rw-r--r-- | macros/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 886fb07..cbeb877 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. |