From 9be8517ca3c417fe09b74992b28c2348cb4a0b1f Mon Sep 17 00:00:00 2001
From: Peter Schlaile <peter@schlaile.de>
Date: Sun, 25 Jun 2006 19:16:45 +0000
Subject: == FFMPEG ==

Merge conflict indicators left... arghh.
---
 extern/Makefile | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'extern/Makefile')

diff --git a/extern/Makefile b/extern/Makefile
index c7d6c647457..766f7f34d92 100644
--- a/extern/Makefile
+++ b/extern/Makefile
@@ -1,9 +1,4 @@
-#
-<<<<<<< Makefile
-# $Id$
-=======
 # $Id$
->>>>>>> 1.18
 #
 # ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
 #
-- 
cgit v1.2.3