diff options
| author | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
|---|---|---|
| committer | mick grierson <mickgrierson@gmail.com> | 2015-10-01 09:54:19 +0100 |
| commit | e4eb667af04304cbe9c0be5997ebea2049178590 (patch) | |
| tree | 5630e70df8199c9f53170c9ef4da1e4dac59e69c /maximilianTest_10.8.xcodeproj/project.xcworkspace | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'maximilianTest_10.8.xcodeproj/project.xcworkspace')
4 files changed, 0 insertions, 48 deletions
diff --git a/maximilianTest_10.8.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/maximilianTest_10.8.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index 9c20359..0000000 --- a/maximilianTest_10.8.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Workspace - version = "1.0"> - <FileRef - location = "self:maximilianTest.xcodeproj"> - </FileRef> -</Workspace> diff --git a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest_10.8.xccheckout b/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest_10.8.xccheckout deleted file mode 100644 index e4311ac..0000000 --- a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest_10.8.xccheckout +++ /dev/null @@ -1,41 +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>IDESourceControlProjectFavoriteDictionaryKey</key> - <false/> - <key>IDESourceControlProjectIdentifier</key> - <string>47E07CF2-D8FB-474C-99E7-26F2F85B9717</string> - <key>IDESourceControlProjectName</key> - <string>maximilianTest_10.8</string> - <key>IDESourceControlProjectOriginsDictionary</key> - <dict> - <key>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</key> - <string>https://github.com/micknoise/Maximilian.git</string> - </dict> - <key>IDESourceControlProjectPath</key> - <string>maximilianTest_10.8.xcodeproj</string> - <key>IDESourceControlProjectRelativeInstallPathDictionary</key> - <dict> - <key>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</key> - <string>../..</string> - </dict> - <key>IDESourceControlProjectURL</key> - <string>https://github.com/micknoise/Maximilian.git</string> - <key>IDESourceControlProjectVersion</key> - <integer>111</integer> - <key>IDESourceControlProjectWCCIdentifier</key> - <string>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</string> - <key>IDESourceControlProjectWCConfigurations</key> - <array> - <dict> - <key>IDESourceControlRepositoryExtensionIdentifierKey</key> - <string>public.vcs.git</string> - <key>IDESourceControlWCCIdentifierKey</key> - <string>9EA75D55FA54A28D61D05E99737654AEBBBF0FB9</string> - <key>IDESourceControlWCCName</key> - <string>Maximilian</string> - </dict> - </array> -</dict> -</plist> diff --git a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/chris.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/chris.xcuserdatad/UserInterfaceState.xcuserstate Binary files differdeleted file mode 100644 index d556c35..0000000 --- a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/chris.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null diff --git a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate Binary files differdeleted file mode 100644 index 6ab58c6..0000000 --- a/maximilianTest_10.8.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate +++ /dev/null |