aboutsummaryrefslogtreecommitdiffstats
path: root/maximilianTest.xcodeproj/xcuserdata/mickgrierson.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.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
parent537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff)
parentdfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff)
resolving merge conflict
Diffstat (limited to 'maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist')
-rw-r--r--maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist5
1 files changed, 5 insertions, 0 deletions
diff --git a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
index f2cc5e9..e44e838 100644
--- a/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/maximilianTest.xcodeproj/xcuserdata/mickgrierson.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,6 +4,11 @@
<dict>
<key>SchemeUserState</key>
<dict>
+ <key>maximilianTest 2.xcscheme</key>
+ <dict>
+ <key>orderHint</key>
+ <integer>1</integer>
+ </dict>
<key>maximilianTest.xcscheme</key>
<dict>
<key>orderHint</key>