Fixed merge

main
q-- 12 years ago committed by Elbert Alias
parent 9dacf73fb5
commit 5bc8b72949

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,11 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
<<<<<<< HEAD
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
=======
"url": "^(www.)?[^/]+\\.tumblr\\.com",
>>>>>>> 7cd3684... More strict patterns
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {

@ -1582,7 +1582,7 @@
"Tumblr": {
"cats": [ 11 ],
"html": "<iframe src=\\\"[^>]+tumblr\\.com",
"url": "^https?://(www\\.)?[^/]+\\.tumblr\\.com/"
"url": "^(www.)?[^/]+\\.tumblr\\.com",
"headers": { "X-Tumblr-Usec": ".*" }
},
"Twilight CMS": {