fix conflicts

main
nurbek 4 years ago
parent d4a1f26fe5
commit 454f14c700

@ -1962,13 +1962,14 @@
"description": "Cookie Information is a privacy tech company that develops software that helps making company websites and mobile apps GDPR and ePrivacy compliant.", "description": "Cookie Information is a privacy tech company that develops software that helps making company websites and mobile apps GDPR and ePrivacy compliant.",
"icon": "Cookie Information.svg", "icon": "Cookie Information.svg",
"js": { "js": {
"CookieInformation.config.cdnUrl": "" "CookieInformation.config.version": "(.+)\\;version:\\1"
}, },
"pricing": [ "pricing": [
"low", "low",
"recurring" "recurring"
], ],
"saas": true, "saas": true,
"scriptSrc": "\\.app\\.cookieinformation\\.com/",
"website": "https://cookieinformation.com" "website": "https://cookieinformation.com"
}, },
"Cookie Notice": { "Cookie Notice": {