diff options
| author | Christian Schaller <uraeus@gnome.org> | 2004-03-07 11:26:27 +0000 |
|---|---|---|
| committer | Christian Schaller <uraeus@gnome.org> | 2004-03-07 11:26:27 +0000 |
| commit | 87d5670f80f7d371c098710d5798ba4736ed9604 (patch) | |
| tree | 30f4ec1832738268cd33a2b2bff73983f6938e8a | |
| parent | c0a0422f35f26f863616b9704793cd3af605af1c (diff) | |
remove conflict indicators
Original commit message from CVS:
remove conflict indicators
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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): |