thomasvs - flumotion/branches/webadmin-1

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Wed Jul 11 13:00:06 2007
New Revision: 5310

Modified:
   flumotion/branches/webadmin-1/ChangeLog
Log:
remove merge marker

Modified: flumotion/branches/webadmin-1/ChangeLog
==============================================================================
--- flumotion/branches/webadmin-1/ChangeLog	(original)
+++ flumotion/branches/webadmin-1/ChangeLog	Wed Jul 11 13:00:06 2007
@@ -215,7 +215,6 @@
 	* configure.ac: Comment out the bit about multiple versions of
 	gstreamer.
 
->>>>>>> .merge-right.r3985
 2006-09-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: