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

…amework into framework_branch

@@ -6,6 +6,7 @@
 	<dict>
 		<key>Assets.car</key>
 		<data>
+<<<<<<< HEAD
 		rhhP5ctoIwX1XBAEn09i99u40VM=
 		</data>
 		<key>Headers/MyApi.h</key>
@@ -15,6 +16,17 @@
 		<key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
 		<data>
 		aEEPm8524J0QBhgj6t6YQFyJaGE=
+=======
+		GOEQIgFzlkFxnZvU1locPg1tlqs=
+		</data>
+		<key>Headers/MyApi.h</key>
+		<data>
+		TmDy/fb2haH2GJeGk04vTk9qbQA=
+		</data>
+		<key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
+		<data>
+		GAiaTscDZowZ4pFCk4QebFrJ4MA=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 		</data>
 		<key>Headers/WarplySDKFrameworkIOS.h</key>
 		<data>
@@ -22,10 +34,23 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
+<<<<<<< HEAD
 		aCEMSKVNv1YmddCEhXL+qubnMuc=
+=======
+		go63oPGQLHME7Fxm6g/GSDh4usk=
+		</data>
+		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
+		<data>
+		/dkXbz/wvdIhF3t0mDaEEyzOM+8=
+		</data>
+		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<data>
+		GqATC3nWxtpwdHvdWPnUObAw6+Q=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 		</data>
 		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<data>
+<<<<<<< HEAD
 		6cWHbGMrHkGBZ3JIjvx0PWlc7Jk=
 		</data>
 		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftdoc</key>
@@ -35,6 +60,9 @@
 		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/x86_64-apple-ios-simulator.swiftmodule</key>
 		<data>
 		CvLiFIiivc0aSr4vZujtebQTqp8=
+=======
+		GObRmyIBAXbT8rBimIzd4IOqdLE=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -87,21 +115,33 @@
 		<dict>
 			<key>hash2</key>
 			<data>
+<<<<<<< HEAD
 			xVSzJAYILk6qIZqjzs1x9ERlz9p+AS+sZuR/XYLVDy0=
+=======
+			RrJYLF4la3FRoMvbr7AO3ap1OLg3kzIzwG0y8PJMWzE=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 			</data>
 		</dict>
 		<key>Headers/MyApi.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
+<<<<<<< HEAD
 			3OiqPvgDi+08xpvVD36ol7pd5LKhvFXC3VVkeS6syG4=
+=======
+			2CnZtEzw6XFQKogiT1997Wvv7/18KJliPibaB5yk1+8=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 			</data>
 		</dict>
 		<key>Headers/WarplySDKFrameworkIOS-Swift.h</key>
 		<dict>
 			<key>hash2</key>
 			<data>
+<<<<<<< HEAD
 			z3w4u1htB+uvK/hO3xalkU7SDg+g0OTS+e6Wd8uQc1k=
+=======
+			5zsdQqj5fGKqBRdyaCZ7n+DmYJwwtumoUeZ7QuZ8IIA=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 			</data>
 		</dict>
 		<key>Headers/WarplySDKFrameworkIOS.h</key>
@@ -111,6 +151,7 @@
 			vzJVcnjXgi6I7JknI81AWPBmBkpWBqV47pSppt4U80Q=
 			</data>
 		</dict>
+<<<<<<< HEAD
 		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo</key>
 		<dict>
 			<key>hash2</key>
@@ -130,6 +171,27 @@
 			<key>hash2</key>
 			<data>
 			3lRbVyD5P1mfFw44ku6U46uZelEzV+rpj/1PyIKCGBk=
+=======
+		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			QIIM6Sp2Me7pdAK3Jdvr+T7LmD2RKMNdemkfuYn5yQ0=
+			</data>
+		</dict>
+		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftdoc</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			KIciF5fGt9a+ufdgXbm838ca+hn7AwzsAbpb4SmPX7E=
+			</data>
+		</dict>
+		<key>Modules/WarplySDKFrameworkIOS.swiftmodule/arm64-apple-ios.swiftmodule</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			/6WisAoihkfW0OY9dpL0y3Kc/PRb20VgFOwkg1m15cs=
+>>>>>>> 00a7bc3b230af9f6c5529afa914992d9d3d89d1e
 			</data>
 		</dict>
 		<key>Modules/module.modulemap</key>