Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
shopify_iossdk
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cemarose
shopify_iossdk
Commits
53559f83
Commit
53559f83
authored
May 09, 2016
by
Brent Gulanowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken file after merge.
parent
f3321e31
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
36 deletions
+23
-36
test_shop_data.json
Mobile Buy SDK/Mobile Buy SDK Tests/test_shop_data.json
+23
-36
No files found.
Mobile Buy SDK/Mobile Buy SDK Tests/test_shop_data.json
View file @
53559f83
{
{
"application_name"
:
"MobileBuyTest"
,
"application_name"
:
"MobileBuyTest"
,
<<<<<<<
Updated
upstream
"shop_domain"
:
""
,
"shop_domain"
:
""
,
"api_key"
:
""
,
"api_key"
:
""
,
"channel_id"
:
""
,
"channel_id"
:
""
,
...
@@ -8,64 +7,51 @@
...
@@ -8,64 +7,51 @@
"merchant_id"
:
""
,
"merchant_id"
:
""
,
"customer_email"
:
""
,
"customer_email"
:
""
,
"customer_password"
:
""
,
"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"
:
[
"product_ids"
:
[
"2096060931"
,
""
,
"2096063363"
,
""
"2096062275"
,
"2096057987"
],
],
<<<<<<<
Updated
upstream
"variants"
:
{
"variants"
:
{
"variant_untracked_id"
:
""
,
"variant_untracked_id"
:
""
,
"variant_inventory1_id"
:
""
,
"variant_inventory1_id"
:
""
,
"variant_soldout_id"
:
""
"variant_soldout_id"
:
""
},
},
"collection_id"
:
""
,
"collection_id"
:
""
,
=======
"collection_id"
:
"109931075"
,
>>>>>>>
Stashed
changes
"gift_cards"
:
{
"gift_cards"
:
{
"
vali
d11"
:
{
"
ValidGiftCar
d11"
:
{
"id"
:
"
8366979
"
,
"id"
:
""
,
"code"
:
"
ValidGiftCard11
"
,
"code"
:
""
,
"value"
:
11
"value"
:
11
},
},
"
vali
d25"
:
{
"
ValidGiftCar
d25"
:
{
"id"
:
"
7441155
"
,
"id"
:
""
,
"code"
:
"
ValidGiftCard25
"
,
"code"
:
""
,
"value"
:
25
"value"
:
25
},
},
"
vali
d50"
:
{
"
ValidGiftCar
d50"
:
{
"id"
:
"
7438659
"
,
"id"
:
""
,
"code"
:
"
ValidGiftCard50
"
,
"code"
:
""
,
"value"
:
50
"value"
:
50
},
},
"expired"
:
{
"expired"
:
{
"id"
:
"
7438723
"
,
"id"
:
""
,
"code"
:
"
ExpiredGiftCard25
"
,
"code"
:
""
,
"value"
:
25
"value"
:
0
},
},
"invalid"
:
{
"invalid"
:
{
"id"
:
"
42424242
"
,
"id"
:
""
,
"code"
:
"
InvalidGiftCard42
"
,
"code"
:
""
,
"value"
:
42
"value"
:
0
}
}
},
},
"discounts"
:
{
"discounts"
:
{
"expired"
:
{
"expired"
:
{
"code"
:
"
expired_discount
"
,
"code"
:
""
,
"value"
:
1
"value"
:
0
},
},
"valid"
:
{
"valid"
:
{
"code"
:
"
12_dollar_discount
"
,
"code"
:
""
,
"value"
:
12
"value"
:
0
}
}
}
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment