[[ Merge ]] Remove conflict from setup_xcode_sdks.py

livecodeali · livecodeali · commit 49c604ed70fb · 2017-12-14T09:26:01.000Z
diff --git a/tools/setup_xcode_sdks.py b/tools/setup_xcode_sdks.py
@@ -1,16 +1,9 @@
 #!/bin/python
 
 # Update these lists if you need different SDK versions!
-<<<<<<< HEAD
-iphoneos_versions = ["11.0", "10.2", "9.2"]
-iphonesimulator_versions = ["11.0", "10.2","9.2", "8.2"]
-macosx_versions = ["10.9"]
-=======
-
 iphoneos_versions = ["11.2", "10.2", "9.2"]
-iphonesimulator_versions = ["11.2", "10.2", "9.2", "8.2", "7.1", "6.1"]
-macosx_versions = ["10.8", "10.6"]
->>>>>>> origin/develop-8.2
+iphonesimulator_versions = ["11.2", "10.2","9.2", "8.2"]
+macosx_versions = ["10.9"]
 
 # This tool creates the symlinks required for Xcode builds of LiveCode.
 #
