remove conflict indicators

Original commit message from CVS:
remove conflict indicators

diff --git a/ChangeLog b/ChangeLog
index 7067212..56f0e42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -116,7 +116,6 @@
          make sure to handle the case where there's no current chain
          gracefully.
 
->>>>>>> 1.392
 2004-03-05  David Schleef  <ds@schleef.org>
 
        * ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):