Commit 3abd8a55 authored by Christian Schaller's avatar Christian Schaller
Browse files

remove conflict indicators

Original commit message from CVS:
remove conflict indicators
parent b854b950
......@@ -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):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment