質問編集履歴
1
パッケージ内容の追加
title
CHANGED
|
File without changes
|
body
CHANGED
|
@@ -6,4 +6,84 @@
|
|
|
6
6
|
大変焦っております。
|
|
7
7
|
何かコミットの方法を間違えたのでしょうか？
|
|
8
8
|
何か修復する方法はありますか？
|
|
9
|
-
よろしくお願いします。
|
|
9
|
+
よろしくお願いします。
|
|
10
|
+
|
|
11
|
+
追記：
|
|
12
|
+
内容を見てみましたが、恥ずかしながら何がなんだかさっぱりわかりません。どのようにして余計な文字列を見抜けば良いのでしょうか？
|
|
13
|
+
|
|
14
|
+
```ここに言語を入力
|
|
15
|
+
// !$*UTF8*$!
|
|
16
|
+
{
|
|
17
|
+
archiveVersion = 1;
|
|
18
|
+
classes = {
|
|
19
|
+
};
|
|
20
|
+
objectVersion = 48;
|
|
21
|
+
objects = {
|
|
22
|
+
|
|
23
|
+
/* Begin PBXBuildFile section */
|
|
24
|
+
<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj
|
|
25
|
+
3C1A4181206DD0F0001D1566 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C1A4180206DD0F0001D1566 /* GameKit.framework */; };
|
|
26
|
+
3C1A4183206DD712001D1566 /* GKLocalPlayerUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1A4182206DD712001D1566 /* GKLocalPlayerUtil.swift */; };
|
|
27
|
+
3C89D9E620734E1E00F314B1 /* GKScoreUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E520734E1E00F314B1 /* GKScoreUtil.swift */; };
|
|
28
|
+
3C89D9E8207773C600F314B1 /* RankingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E7207773C500F314B1 /* RankingViewController.swift */; };
|
|
29
|
+
3C89D9EA207F4B4900F314B1 /* TrapRankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9E9207F4B4900F314B1 /* TrapRankViewController.swift */; };
|
|
30
|
+
3C89D9EC207F4B5F00F314B1 /* EndlessRankViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C89D9EB207F4B5F00F314B1 /* EndlessRankViewController.swift */; };
|
|
31
|
+
=======
|
|
32
|
+
5B815F2D699A6400822CC4E0 /* Pods_TouchTiles.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2302079C0B7096C88E3A79D /* Pods_TouchTiles.framework */; };
|
|
33
|
+
>>>>>>> bffdf4456fd35de635d7b2437d7a1372a5781dcc:TouchTiles/TouchTiles.xcodeproj/project.pbxproj
|
|
34
|
+
F01E319A206A1D3800D3A040 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E3199206A1D3800D3A040 /* AppDelegate.swift */; };
|
|
35
|
+
F01E319C206A1D3800D3A040 /* TopViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E319B206A1D3800D3A040 /* TopViewController.swift */; };
|
|
36
|
+
F01E319F206A1D3800D3A040 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F01E319D206A1D3800D3A040 /* Main.storyboard */; };
|
|
37
|
+
F01E31A2206A1D3800D3A040 /* TouchTiles.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = F01E31A0206A1D3800D3A040 /* TouchTiles.xcdatamodeld */; };
|
|
38
|
+
F01E31A4206A1D3800D3A040 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F01E31A3206A1D3800D3A040 /* Assets.xcassets */; };
|
|
39
|
+
F01E31A7206A1D3800D3A040 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F01E31A5206A1D3800D3A040 /* LaunchScreen.storyboard */; };
|
|
40
|
+
F01E31AF206A1D6800D3A040 /* TrapGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31AE206A1D6800D3A040 /* TrapGameViewController.swift */; };
|
|
41
|
+
F01E31B1206A223000D3A040 /* TrapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B0206A223000D3A040 /* TrapView.swift */; };
|
|
42
|
+
F01E31B3206A23C300D3A040 /* TopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B2206A23C300D3A040 /* TopView.swift */; };
|
|
43
|
+
F01E31B5206A36B600D3A040 /* GameTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31B4206A36B600D3A040 /* GameTile.swift */; };
|
|
44
|
+
F01E31B7206A389B00D3A040 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F01E31B6206A389B00D3A040 /* Default@2x.png */; };
|
|
45
|
+
F01E31BA206A38B700D3A040 /* clear.png in Resources */ = {isa = PBXBuildFile; fileRef = F01E31B9206A38B700D3A040 /* clear.png */; };
|
|
46
|
+
F01E31BC206C828600D3A040 /* StandardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F01E31BB206C828600D3A040 /* StandardView.swift */; };
|
|
47
|
+
F05C66DE206CE15C001C9AA0 /* EndlessViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66DD206CE15C001C9AA0 /* EndlessViewController.swift */; };
|
|
48
|
+
F05C66E0206CE1A4001C9AA0 /* EndlessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66DF206CE1A4001C9AA0 /* EndlessView.swift */; };
|
|
49
|
+
F05C66E2206CE23A001C9AA0 /* StandardGameViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F05C66E1206CE23A001C9AA0 /* StandardGameViewController.swift */; };
|
|
50
|
+
F09915BB2080632500BCEE6B /* GameTileStandardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09915BA2080632500BCEE6B /* GameTileStandardView.swift */; };
|
|
51
|
+
F09915BD2080795E00BCEE6B /* GameTileEndlessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F09915BC2080795E00BCEE6B /* GameTileEndlessView.swift */; };
|
|
52
|
+
/* End PBXBuildFile section */
|
|
53
|
+
|
|
54
|
+
/* Begin PBXFileReference section */
|
|
55
|
+
<<<<<<< HEAD:TouchTiles2/TouchTiles.xcodeproj/project.pbxproj
|
|
56
|
+
3C1A4180206DD0F0001D1566 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
|
|
57
|
+
3C1A4182206DD712001D1566 /* GKLocalPlayerUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GKLocalPlayerUtil.swift; sourceTree = "<group>"; };
|
|
58
|
+
3C89D9E520734E1E00F314B1 /* GKScoreUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GKScoreUtil.swift; sourceTree = "<group>"; };
|
|
59
|
+
3C89D9E7207773C500F314B1 /* RankingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingViewController.swift; sourceTree = "<group>"; };
|
|
60
|
+
3C89D9E9207F4B4900F314B1 /* TrapRankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapRankViewController.swift; sourceTree = "<group>"; };
|
|
61
|
+
3C89D9EB207F4B5F00F314B1 /* EndlessRankViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessRankViewController.swift; sourceTree = "<group>"; };
|
|
62
|
+
=======
|
|
63
|
+
A25437658C0E1F772899FD87 /* Pods-TouchTiles.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchTiles.debug.xcconfig"; path = "Pods/Target Support Files/Pods-TouchTiles/Pods-TouchTiles.debug.xcconfig"; sourceTree = "<group>"; };
|
|
64
|
+
AC9C8F0B41C40059F6768FCD /* Pods-TouchTiles.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TouchTiles.release.xcconfig"; path = "Pods/Target Support Files/Pods-TouchTiles/Pods-TouchTiles.release.xcconfig"; sourceTree = "<group>"; };
|
|
65
|
+
C2302079C0B7096C88E3A79D /* Pods_TouchTiles.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TouchTiles.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
66
|
+
>>>>>>> bffdf4456fd35de635d7b2437d7a1372a5781dcc:TouchTiles/TouchTiles.xcodeproj/project.pbxproj
|
|
67
|
+
F01E3196206A1D3800D3A040 /* TouchTiles.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TouchTiles.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
|
68
|
+
F01E3199206A1D3800D3A040 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
|
69
|
+
F01E319B206A1D3800D3A040 /* TopViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopViewController.swift; sourceTree = "<group>"; };
|
|
70
|
+
F01E319E206A1D3800D3A040 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
|
71
|
+
F01E31A1206A1D3800D3A040 /* TouchTiles.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TouchTiles.xcdatamodel; sourceTree = "<group>"; };
|
|
72
|
+
F01E31A3206A1D3800D3A040 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
|
73
|
+
F01E31A6206A1D3800D3A040 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
|
74
|
+
F01E31A8206A1D3800D3A040 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
|
|
75
|
+
F01E31AE206A1D6800D3A040 /* TrapGameViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapGameViewController.swift; sourceTree = "<group>"; };
|
|
76
|
+
F01E31B0206A223000D3A040 /* TrapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrapView.swift; sourceTree = "<group>"; };
|
|
77
|
+
F01E31B2206A23C300D3A040 /* TopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TopView.swift; sourceTree = "<group>"; };
|
|
78
|
+
F01E31B4206A36B600D3A040 /* GameTile.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GameTile.swift; sourceTree = "<group>"; };
|
|
79
|
+
F01E31B6206A389B00D3A040 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
|
|
80
|
+
F01E31B9206A38B700D3A040 /* clear.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clear.png; sourceTree = "<group>"; };
|
|
81
|
+
F01E31BB206C828600D3A040 /* StandardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StandardView.swift; sourceTree = "<group>"; };
|
|
82
|
+
F05C66DD206CE15C001C9AA0 /* EndlessViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessViewController.swift; sourceTree = "<group>"; };
|
|
83
|
+
F05C66DF206CE1A4001C9AA0 /* EndlessView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EndlessView.swift; sourceTree = "<group>"; };
|
|
84
|
+
F05C66E1206CE23A001C9AA0 /* StandardGameViewController.swift */ =
|
|
85
|
+
|
|
86
|
+
以下略
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
```
|