open-source / warply_sdk_framework

Go to a project
Toggle navigation Toggle navigation pinning
Vasilis
4d0223b7 2 parents 363d3213 00a7bc3b

Merge branch 'framework_branch' of https://git.warp.ly/open-source/warply_sdk_fr… 

…amework into framework_branch
Inline Side-by-side
Showing 1 changed file with 62 additions and 0 deletions
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
6 <dict> 6 <dict>
7 <key>Assets.car</key> 7 <key>Assets.car</key>
8 <data> 8 <data>
9 +<<<<<<< HEAD
9 rhhP5ctoIwX1XBAEn09i99u40VM= 10 rhhP5ctoIwX1XBAEn09i99u40VM=
10 </data> 11 </data>
11 <key>Headers/MyApi.h</key> 12 <key>Headers/MyApi.h</key>
...@@ -15,6 +16,17 @@ ...@@ -15,6 +16,17 @@
15 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key> 16 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
16 <data> 17 <data>
17 aEEPm8524J0QBhgj6t6YQFyJaGE= 18 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
18 </data> 30 </data>
19 <key>Headers/WarplySDKFrameworkIOS.h</key> 31 <key>Headers/WarplySDKFrameworkIOS.h</key>
20 <data> 32 <data>
...@@ -22,10 +34,23 @@ ...@@ -22,10 +34,23 @@
22 </data> 34 </data>
23 <key>Info.plist</key> 35 <key>Info.plist</key>
24 <data> 36 <data>
37 +<<<<<<< HEAD
25 aCEMSKVNv1YmddCEhXL+qubnMuc= 38 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
26 </data> 50 </data>
27 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key> 51 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
28 <data> 52 <data>
53 +<<<<<<< HEAD
29 6cWHbGMrHkGBZ3JIjvx0PWlc7Jk= 54 6cWHbGMrHkGBZ3JIjvx0PWlc7Jk=
30 </data> 55 </data>
31 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key> 56 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
...@@ -35,6 +60,9 @@ ...@@ -35,6 +60,9 @@
35 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key> 60 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
36 <data> 61 <data>
37 CvLiFIiivc0aSr4vZujtebQTqp8= 62 CvLiFIiivc0aSr4vZujtebQTqp8=
63 +=======
64 + GObRmyIBAXbT8rBimIzd4IOqdLE=
65 +>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
38 </data> 66 </data>
39 <key>Modules/module.modulemap</key> 67 <key>Modules/module.modulemap</key>
40 <data> 68 <data>
...@@ -87,21 +115,33 @@ ...@@ -87,21 +115,33 @@
87 <dict> 115 <dict>
88 <key>hash2</key> 116 <key>hash2</key>
89 <data> 117 <data>
118 +<<<<<<< HEAD
90 xVSzJAYILk6qIZqjzs1x9ERlz9p+AS+sZuR/XYLVDy0= 119 xVSzJAYILk6qIZqjzs1x9ERlz9p+AS+sZuR/XYLVDy0=
120 +=======
121 + RrJYLF4la3FRoMvbr7AO3ap1OLg3kzIzwG0y8PJMWzE=
122 +>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
91 </data> 123 </data>
92 </dict> 124 </dict>
93 <key>Headers/MyApi.h</key> 125 <key>Headers/MyApi.h</key>
94 <dict> 126 <dict>
95 <key>hash2</key> 127 <key>hash2</key>
96 <data> 128 <data>
129 +<<<<<<< HEAD
97 3OiqPvgDi+08xpvVD36ol7pd5LKhvFXC3VVkeS6syG4= 130 3OiqPvgDi+08xpvVD36ol7pd5LKhvFXC3VVkeS6syG4=
131 +=======
132 + 2CnZtEzw6XFQKogiT1997Wvv7/18KJliPibaB5yk1+8=
133 +>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
98 </data> 134 </data>
99 </dict> 135 </dict>
100 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key> 136 <key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
101 <dict> 137 <dict>
102 <key>hash2</key> 138 <key>hash2</key>
103 <data> 139 <data>
140 +<<<<<<< HEAD
104 z3w4u1htB+uvK/hO3xalkU7SDg+g0OTS+e6Wd8uQc1k= 141 z3w4u1htB+uvK/hO3xalkU7SDg+g0OTS+e6Wd8uQc1k=
142 +=======
143 + 5zsdQqj5fGKqBRdyaCZ7n+DmYJwwtumoUeZ7QuZ8IIA=
144 +>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
105 </data> 145 </data>
106 </dict> 146 </dict>
107 <key>Headers/WarplySDKFrameworkIOS.h</key> 147 <key>Headers/WarplySDKFrameworkIOS.h</key>
...@@ -111,6 +151,7 @@ ...@@ -111,6 +151,7 @@
111 vzJVcnjXgi6I7JknI81AWPBmBkpWBqV47pSppt4U80Q= 151 vzJVcnjXgi6I7JknI81AWPBmBkpWBqV47pSppt4U80Q=
112 </data> 152 </data>
113 </dict> 153 </dict>
154 +<<<<<<< HEAD
114 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key> 155 <key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
115 <dict> 156 <dict>
116 <key>hash2</key> 157 <key>hash2</key>
...@@ -130,6 +171,27 @@ ...@@ -130,6 +171,27 @@
130 <key>hash2</key> 171 <key>hash2</key>
131 <data> 172 <data>
132 3lRbVyD5P1mfFw44ku6U46uZelEzV+rpj/1PyIKCGBk= 173 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
133 </data> 195 </data>
134 </dict> 196 </dict>
135 <key>Modules/module.modulemap</key> 197 <key>Modules/module.modulemap</key>
......