[SCM] libav/ubuntu.extra: remove spurious conflict in debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.extra branch:
commit 5a8e1788f3724cbb422c0f32a8b41097f229da36
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 11 09:30:30 2012 +0200

    remove spurious conflict in debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 7316044..ca2d7a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -268,14 +268,11 @@ libav (4:0.8.3-0ubuntu1) quantal; urgency=low
           bytestream2 API, and therefore benefit from additional overflow
           checks: truemotion2, utvideo, vqavideo
   * libav-tools: add pre-depends on dpkg
-<<<<<<< HEAD
-=======
   * ffmpeg: update Conflict/Replaces relationships
   
   [ Matthieu Baerts (matttbe) <matttbe at gmail.com> ]
   * debian/ffmpeg.install and debian/libav-tools.install:
     - Moved all ffmpeg binaries and manpages to ffmpeg package (LP: #1011136)
->>>>>>> ubuntu
   
  -- Reinhard Tartler <siretart at tauware.de>  Sun, 10 Jun 2012 20:24:59 +0200
 

-- 
Libav/FFmpeg packaging