From fd801cb17112d0b5b7c1ab8ab30b9b41b9814dd1 Mon Sep 17 00:00:00 2001
From: mbusb <feedback.multibootusb@gmail.com>
Date: Wed, 10 May 2017 14:22:24 +0530
Subject: [PATCH] Fix git commit error for release.

---
 multibootusb | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/multibootusb b/multibootusb
index 2d4a633..76b8096 100644
--- 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