fix conflicts

main
nurbek 3 years ago
parent 63235dcf5c
commit 9ed07058bc

@ -3050,7 +3050,7 @@
], ],
"description": "SpurIT is a team of certified Shopify experts which provide ecommerce software solutions.", "description": "SpurIT is a team of certified Shopify experts which provide ecommerce software solutions.",
"icon": "SpurIT.svg", "icon": "SpurIT.svg",
"implies": "Shopify", "requires": "Shopify",
"js": { "js": {
"Spurit.global.version": "(.+)\\;version:\\1" "Spurit.global.version": "(.+)\\;version:\\1"
}, },
@ -3069,7 +3069,7 @@
], ],
"description": "SpurIT Abandoned Cart Reminder bring back your Shopify store visitors who moved to another tab by blinking your store tab.", "description": "SpurIT Abandoned Cart Reminder bring back your Shopify store visitors who moved to another tab by blinking your store tab.",
"icon": "SpurIT.svg", "icon": "SpurIT.svg",
"implies": "Shopify", "requires": "Shopify",
"js": { "js": {
"ACR_SPURIT_Params.folderCss": "cdn-spurit\\.com/shopify-apps/abandoned-cart-reminder/" "ACR_SPURIT_Params.folderCss": "cdn-spurit\\.com/shopify-apps/abandoned-cart-reminder/"
}, },
@ -3087,7 +3087,7 @@
], ],
"description": "SpurIT Recurring Payments App is a simple way to create a system of bill payment,subscriptions and invoicing.", "description": "SpurIT Recurring Payments App is a simple way to create a system of bill payment,subscriptions and invoicing.",
"icon": "SpurIT.svg", "icon": "SpurIT.svg",
"implies": "Shopify", "requires": "Shopify",
"js": { "js": {
"Spurit.recurringInvoices": "" "Spurit.recurringInvoices": ""
}, },
@ -3105,7 +3105,7 @@
], ],
"description": "SpurIT Partial Payments App allow your customers to pay for the order in several ways or to share a payment with other people.", "description": "SpurIT Partial Payments App allow your customers to pay for the order in several ways or to share a payment with other people.",
"icon": "SpurIT.svg", "icon": "SpurIT.svg",
"implies": "Shopify", "requires": "Shopify",
"scriptSrc": "cdn-spurit\\.com/shopify-apps/split-payments/", "scriptSrc": "cdn-spurit\\.com/shopify-apps/split-payments/",
"saas": true, "saas": true,
"pricing": [ "pricing": [
@ -3121,7 +3121,7 @@
], ],
"description": "SpurIT Loyalty App is a turnkey solution allowing you to reward existing customers in a number of ways.", "description": "SpurIT Loyalty App is a turnkey solution allowing you to reward existing customers in a number of ways.",
"icon": "SpurIT.svg", "icon": "SpurIT.svg",
"implies": "Shopify", "requires": "Shopify",
"js": { "js": {
"Spurit.Loyaltypoints": "" "Spurit.Loyaltypoints": ""
}, },
@ -3976,7 +3976,7 @@
"description": "Syndeca is a visual commerce platform that allows brands to quickly create engaging, actionable campaigns.", "description": "Syndeca is a visual commerce platform that allows brands to quickly create engaging, actionable campaigns.",
"icon": "Syndeca.svg", "icon": "Syndeca.svg",
"js": { "js": {
"ss360Config": "" "SyndecaAnalyticsObject": ""
}, },
"pricing": [ "pricing": [
"poa" "poa"