[youtube-dl/f18] Fix the <<<

[Christopher Meng]

commit 443c888c6df75c4298094366b6dc90176acc148d
Author: Christopher Meng <rpm at cicku.me>
Date:   Wed Jul 3 00:27:52 2013 +0800

    Fix the <<<

 youtube-dl.spec |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/youtube-dl.spec b/youtube-dl.spec
index f739624..23988fa 100644
--- a/youtube-dl.spec
+++ b/youtube-dl.spec
@@ -35,11 +35,7 @@ mkdir -p %{buildroot}%{_sysconfdir}
 install -p -m644 %{S:1} %{buildroot}%{_sysconfdir}
 
 %check
-<<<<<<< HEAD
-make test
-=======
 #make test
->>>>>>> master
 
 %files
 %doc LICENSE