Skip to content

Commit

Permalink
Fix info.plist conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Kristian committed Nov 29, 2017
1 parent 9359ac1 commit c1df608
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions ZEAL.indigoPlugin/Contents/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit c1df608

Please sign in to comment.