Fix git commit error for release.

mbusb · May 10, 2017 · fd801cb · fd801cb
1 parent d9863ac
commit fd801cb
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/multibootusb b/multibootusb
@@ -5,11 +5,7 @@
 # Authors:  Sundar
 # Licence:  This file is a part of multibootusb package. You can redistribute it or modify
 #           under the terms of GNU General Public License, version 2 or above.
-
-<<<<<<< HEAD
 import os
-=======
->>>>>>> devel
 import getopt
 import sys
 import platform