From f2c94d14683658514c236b38e9ed7ef557b7145f Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Wed, 31 Dec 2008 11:20:55 +0000
Subject: ChangeLog: Remove conflict marker from ChangeLog

Original commit message from CVS:
* ChangeLog:
Remove conflict marker from ChangeLog
---
 ChangeLog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index c4259999..89259836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-31  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* ChangeLog:
+	Remove conflict marker from ChangeLog
+
 2008-12-28  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	Patch by: j^ <j at oil21.org>
@@ -210,7 +215,6 @@
 	Make usage of libv4l optional by a configure parameter.
 	Fixes bug #563504.
 
->>>>>>> 1.3872
 2008-12-05  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* docs/plugins/Makefile.am:
-- 
cgit v1.2.3