Fix git commit error for release.

7 years ago · fd801cb171
parent d9863ac9b5
commit fd801cb171
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -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