aboutsummaryrefslogtreecommitdiffstats
path: root/maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist
diff options
context:
space:
mode:
authormick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
committermick grierson <mickgrierson@gmail.com>2015-10-01 09:54:19 +0100
commite4eb667af04304cbe9c0be5997ebea2049178590 (patch)
tree5630e70df8199c9f53170c9ef4da1e4dac59e69c /maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist
parent537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff)
parentdfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff)
resolving merge conflict
Diffstat (limited to 'maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist')
-rw-r--r--maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist22
1 files changed, 0 insertions, 22 deletions
diff --git a/maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist b/maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index f2cc5e9..0000000
--- a/maximilianTest_10.8.xcodeproj/xcuserdata/mick.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>maximilianTest.xcscheme</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- </dict>
- <key>SuppressBuildableAutocreation</key>
- <dict>
- <key>8DD76F620486A84900D96B5E</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- </dict>
-</dict>
-</plist>