remove a diff line

mineo · Feb 15, 2013 · 7f6a19d · 7f6a19d
1 parent a665c95
commit 7f6a19d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/isrcsubmit-cdrdao.py b/isrcsubmit-cdrdao.py
@@ -19,7 +19,6 @@
 """
 import discid
 import getpass
-<<<<<<< HEAD
 import musicbrainzngs
 import optparse
 import subprocess