From c1df6082f276ccd974358d57f5f34adca292faf3 Mon Sep 17 00:00:00 2001
From: Kristian <kristian.hjelmeland@gmail.com>
Date: Wed, 29 Nov 2017 22:52:09 +0100
Subject: [PATCH] Fix info.plist conflict

---
 ZEAL.indigoPlugin/Contents/Info.plist | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ZEAL.indigoPlugin/Contents/Info.plist b/ZEAL.indigoPlugin/Contents/Info.plist
index 4b57827..04d5922 100644
--- a/ZEAL.indigoPlugin/Contents/Info.plist
+++ b/ZEAL.indigoPlugin/Contents/Info.plist
@@ -3,11 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-<<<<<<< HEAD
 	<string>0.3.3</string>
-=======
-	<string>0.3.2</string>
->>>>>>> 873bfe4fd26c88d37a766a25700d20eb4c1bee94
 	<key>ServerApiVersion</key>
 	<string>2.0</string>
 	<key>IwsApiVersion</key>