Fixed merge

main
Elbert Alias 13 years ago
parent 0e6c680ed4
commit 3743535657

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },

@ -1397,13 +1397,8 @@
cats: [ 6 ], cats: [ 6 ],
html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/ html: /Shopsystem von <a href="http:\/\/www\.store-systems\.de"|\.mws_boxTop/
}, },
<<<<<<< HEAD
'SublimeVideo': {
cats: [ 14, 31 ],
=======
'SublimeVideo': { 'SublimeVideo': {
cats: [ 14 ], cats: [ 14 ],
>>>>>>> d21c37b881b38ba517900c5411a70a1a264b70ec
script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/, script: /http\:\/\/cdn\.sublimevideo\.net\/js\/[a-z0-9]+\.js/,
env: /^sublimevideo$/ env: /^sublimevideo$/
}, },