[SCM] libav/ubuntu: fixup changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit af7cfda0f2b16605feb1ef0de06461d38f57367e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 13 19:20:47 2013 +0100

    fixup changelog

diff --git a/debian/changelog b/debian/changelog
index 80962cc..414b87f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,7 +62,6 @@ libav (6:9~beta2-2) experimental; urgency=low
     issues with libavutil51.
 
  -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Nov 2012 17:21:15 +0100
->>>>>>> experimental
 
 libav (6:9~beta2-1) experimental; urgency=low
 

-- 
Libav/FFmpeg packaging