open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Vasilis
9f000b7d 1 parent 4d0223b7

try 2

Inline Side-by-side
Showing 4 changed files with 4 additions and 66 deletions
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
6 <dict> 6 <dict>
7 <key>Assets.car</key> 7 <key>Assets.car</key>
8 <data> 8 <data>
9 -<<<<<<< HEAD 9 + BDS6gpOahDQYpqU+q6hpAAO8tyI=
10 - rhhP5ctoIwX1XBAEn09i99u40VM=
11 </data> 10 </data>
12 <key>Headers/MyApi.h</key> 11 <key>Headers/MyApi.h</key>
13 <data> 12 <data>
...@@ -16,17 +15,6 @@ ...@@ -16,17 +15,6 @@
16 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key> 15 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
17 <data> 16 <data>
18 aEEPm8524J0QBhgj6t6YQFyJaGE= 17 aEEPm8524J0QBhgj6t6YQFyJaGE=
19 -=======
20 - GOEQIgFzlkFxnZvU1locPg1tlqs=
21 - </data>
22 - <key>Headers/MyApi.h</key>
23 - <data>
24 - TmDy/fb2haH2GJeGk04vTk9qbQA=
25 - </data>
26 - <key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
27 - <data>
28 - GAiaTscDZowZ4pFCk4QebFrJ4MA=
29 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
30 </data> 18 </data>
31 <key>Headers/WarplySDKFrameworkIOS.h</key> 19 <key>Headers/WarplySDKFrameworkIOS.h</key>
32 <data> 20 <data>
...@@ -34,24 +22,11 @@ ...@@ -34,24 +22,11 @@
34 </data> 22 </data>
35 <key>Info.plist</key> 23 <key>Info.plist</key>
36 <data> 24 <data>
37 -<<<<<<< HEAD
38 aCEMSKVNv1YmddCEhXL+qubnMuc= 25 aCEMSKVNv1YmddCEhXL+qubnMuc=
39 -=======
40 - go63oPGQLHME7Fxm6g/GSDh4usk=
41 - </data>
42 - <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
43 - <data>
44 - /dkXbz/wvdIhF3t0mDaEEyzOM+8=
45 - </data>
46 - <key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftdoc</key>
47 - <data>
48 - GqATC3nWxtpwdHvdWPnUObAw6+Q=
49 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
50 </data> 26 </data>
51 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key> 27 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
52 <data> 28 <data>
53 -<<<<<<< HEAD 29 + lv4L6uqaBoZT9JfpeG0dEeANTR0=
54 - 6cWHbGMrHkGBZ3JIjvx0PWlc7Jk=
55 </data> 30 </data>
56 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key> 31 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
57 <data> 32 <data>
...@@ -60,9 +35,6 @@ ...@@ -60,9 +35,6 @@
60 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key> 35 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
61 <data> 36 <data>
62 CvLiFIiivc0aSr4vZujtebQTqp8= 37 CvLiFIiivc0aSr4vZujtebQTqp8=
63 -=======
64 - GObRmyIBAXbT8rBimIzd4IOqdLE=
65 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
66 </data> 38 </data>
67 <key>Modules/module.modulemap</key> 39 <key>Modules/module.modulemap</key>
68 <data> 40 <data>
...@@ -115,33 +87,21 @@ ...@@ -115,33 +87,21 @@
115 <dict> 87 <dict>
116 <key>hash2</key> 88 <key>hash2</key>
117 <data> 89 <data>
118 -<<<<<<< HEAD 90 + /Y/7rT7nXLz5CrTCc+l5LNuHhxET708eByfYHht7rfQ=
119 - xVSzJAYILk6qIZqjzs1x9ERlz9p+AS+sZuR/XYLVDy0=
120 -=======
121 - RrJYLF4la3FRoMvbr7AO3ap1OLg3kzIzwG0y8PJMWzE=
122 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
123 </data> 91 </data>
124 </dict> 92 </dict>
125 <key>Headers/MyApi.h</key> 93 <key>Headers/MyApi.h</key>
126 <dict> 94 <dict>
127 <key>hash2</key> 95 <key>hash2</key>
128 <data> 96 <data>
129 -<<<<<<< HEAD
130 3OiqPvgDi+08xpvVD36ol7pd5LKhvFXC3VVkeS6syG4= 97 3OiqPvgDi+08xpvVD36ol7pd5LKhvFXC3VVkeS6syG4=
131 -=======
132 - 2CnZtEzw6XFQKogiT1997Wvv7/18KJliPibaB5yk1+8=
133 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
134 </data> 98 </data>
135 </dict> 99 </dict>
136 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key> 100 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
137 <dict> 101 <dict>
138 <key>hash2</key> 102 <key>hash2</key>
139 <data> 103 <data>
140 -<<<<<<< HEAD
141 z3w4u1htB+uvK/hO3xalkU7SDg+g0OTS+e6Wd8uQc1k= 104 z3w4u1htB+uvK/hO3xalkU7SDg+g0OTS+e6Wd8uQc1k=
142 -=======
143 - 5zsdQqj5fGKqBRdyaCZ7n+DmYJwwtumoUeZ7QuZ8IIA=
144 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
145 </data> 105 </data>
146 </dict> 106 </dict>
147 <key>Headers/WarplySDKFrameworkIOS.h</key> 107 <key>Headers/WarplySDKFrameworkIOS.h</key>
...@@ -151,12 +111,11 @@ ...@@ -151,12 +111,11 @@
151 vzJVcnjXgi6I7JknI81AWPBmBkpWBqV47pSppt4U80Q= 111 vzJVcnjXgi6I7JknI81AWPBmBkpWBqV47pSppt4U80Q=
152 </data> 112 </data>
153 </dict> 113 </dict>
154 -<<<<<<< HEAD
155 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key> 114 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
156 <dict> 115 <dict>
157 <key>hash2</key> 116 <key>hash2</key>
158 <data> 117 <data>
159 - hwA4MDaD3f8GihwVecTmRyamzTdhJRdPv3X+ZzLUztk= 118 + SRCzSDWj2/uv8Bmw0GJJsww2ujIX/UjuDNaC6XgjfEU=
160 </data> 119 </data>
161 </dict> 120 </dict>
162 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key> 121 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
...@@ -171,27 +130,6 @@ ...@@ -171,27 +130,6 @@
171 <key>hash2</key> 130 <key>hash2</key>
172 <data> 131 <data>
173 3lRbVyD5P1mfFw44ku6U46uZelEzV+rpj/1PyIKCGBk= 132 3lRbVyD5P1mfFw44ku6U46uZelEzV+rpj/1PyIKCGBk=
174 -=======
175 - <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
176 - <dict>
177 - <key>hash2</key>
178 - <data>
179 - QIIM6Sp2Me7pdAK3Jdvr+T7LmD2RKMNdemkfuYn5yQ0=
180 - </data>
181 - </dict>
182 - <key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftdoc</key>
183 - <dict>
184 - <key>hash2</key>
185 - <data>
186 - KIciF5fGt9a+ufdgXbm838ca+hn7AwzsAbpb4SmPX7E=
187 - </data>
188 - </dict>
189 - <key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftmodule</key>
190 - <dict>
191 - <key>hash2</key>
192 - <data>
193 - /6WisAoihkfW0OY9dpL0y3Kc/PRb20VgFOwkg1m15cs=
194 ->>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
195 </data> 133 </data>
196 </dict> 134 </dict>
197 <key>Modules/module.modulemap</key> 135 <key>Modules/module.modulemap</key>
......