diff options
| author | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
|---|---|---|
| committer | Chris Kiefer <chrisk13fer@gmail.com> | 2012-02-22 12:10:20 +0000 |
| commit | 0c65d2ad2162db3ffbea3e3175675ad4b4598688 (patch) | |
| tree | 5b1d6bd8b9dbe4069b8bf1a9bddb374d957c2cab /maximilianTest.xcodeproj/project.xcworkspace | |
| parent | 9f073116e8b21af58415204edecf42fec5f2c3ed (diff) | |
| parent | bb60cd352f53f4600913d2152032dd4aff228520 (diff) | |
resolved merge conflicts
Diffstat (limited to 'maximilianTest.xcodeproj/project.xcworkspace')
2 files changed, 7 insertions, 0 deletions
diff --git a/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..9c20359 --- /dev/null +++ b/maximilianTest.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "self:maximilianTest.xcodeproj"> + </FileRef> +</Workspace> diff --git a/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate Binary files differnew file mode 100644 index 0000000..1581f28 --- /dev/null +++ b/maximilianTest.xcodeproj/project.xcworkspace/xcuserdata/mickgrierson.xcuserdatad/UserInterfaceState.xcuserstate |