remove conflict indicators
Original commit message from CVS: remove conflict indicators
This commit is contained in:
parent
0bf7a637b1
commit
341e985b1b
@ -116,7 +116,6 @@
|
|||||||
make sure to handle the case where there's no current chain
|
make sure to handle the case where there's no current chain
|
||||||
gracefully.
|
gracefully.
|
||||||
|
|
||||||
>>>>>>> 1.392
|
|
||||||
2004-03-05 David Schleef <ds@schleef.org>
|
2004-03-05 David Schleef <ds@schleef.org>
|
||||||
|
|
||||||
* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):
|
* ext/aalib/gstaasink.c: (gst_aasink_fixate), (gst_aasink_init):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user