Merge pull request #150 from Shopify/task/fix-shop-data

Fix broken file after merge.

Mobile Buy SDK/Mobile Buy SDK Tests/test_shop_data.json

 {
 	"application_name": "MobileBuyTest",
-<<<<<<< Updated upstream
 	"shop_domain": "",
 	"api_key": "",
 	"channel_id": "",
@@ -8,64 +7,51 @@
 	"merchant_id": "",
 	"customer_email": "",
 	"customer_password": "",
-=======
-	"shop_domain": "mobilebuysdktestshop.myshopify.com",
-	"api_key": "fccaa7eceb7d210a6e5366e676d4edff",
-	"channel_id": "26915715",
-	"app_id": "8",
-	"merchant_id": "merchant.com.shopify.applepay",
->>>>>>> Stashed changes
 	"product_ids": [
-					"2096060931",
-					"2096063363",
-					"2096062275",
-					"2096057987"
+					"",
+					""
 					],
-<<<<<<< Updated upstream
 	"variants": {
 		"variant_untracked_id": "",
 		"variant_inventory1_id": "",
 		"variant_soldout_id": ""
 	},
 	"collection_id": "",
-=======
-	"collection_id": "109931075",
->>>>>>> Stashed changes
 	"gift_cards": {
-		"valid11": {
-			"id": "8366979",
-			"code": "ValidGiftCard11",
+		"ValidGiftCard11": {
+			"id": "",
+			"code": "",
 			"value": 11
 		},
-		"valid25": {
-			"id": "7441155",
-			"code": "ValidGiftCard25",
+		"ValidGiftCard25": {
+			"id": "",
+			"code": "",
 			"value": 25
 		},
-		"valid50": {
-			"id": "7438659",
-			"code": "ValidGiftCard50",
+		"ValidGiftCard50": {
+			"id": "",
+			"code": "",
 			"value": 50
 		},
 		"expired": {
-			"id": "7438723",
-			"code": "ExpiredGiftCard25",
-			"value": 25
+			"id": "",
+			"code": "",
+			"value": 0
 		},
 		"invalid": {
-			"id": "42424242",
-			"code": "InvalidGiftCard42",
-			"value": 42
+			"id": "",
+			"code": "",
+			"value": 0
 		}
 	},
 	"discounts": {
 		"expired": {
-			"code": "expired_discount",
-			"value": 1
+			"code": "",
+			"value": 0
 		},
 		"valid": {
-			"code": "12_dollar_discount",
-			"value": 12
+			"code": "",
+			"value": 0
 		}
 	}
-}
+}
\ No newline at end of file