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.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout | |
| parent | 537a5a959f8ec9c4fcb5fd016f2a6be65ca99f3c (diff) | |
| parent | dfa3efd8495628d55f55ee8c8c8576095c2089e4 (diff) | |
resolving merge conflict
Diffstat (limited to 'maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout')
| -rw-r--r-- | maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout b/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout index 5d2d0a5..e79b845 100644 --- a/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout +++ b/maximilianTest.xcodeproj/project.xcworkspace/xcshareddata/maximilianTest.xccheckout @@ -5,7 +5,7 @@ <key>IDESourceControlProjectFavoriteDictionaryKey</key> <false/> <key>IDESourceControlProjectIdentifier</key> - <string>D273FE0A-5762-4D51-9EDD-E4A13BC39DEF</string> + <string>C4FCE672-B26A-41DB-844A-5858A6AED09A</string> <key>IDESourceControlProjectName</key> <string>maximilianTest</string> <key>IDESourceControlProjectOriginsDictionary</key> |