Fix merge conflict

main
Elbert Filius 8 years ago
parent ec6f609c90
commit 6644f04eff

@ -8111,7 +8111,8 @@
"PHP", "PHP",
"jQuery" "jQuery"
], ],
"script": "lucide\\.init\\.js", "icon": "translucide.svg",
"script": "lucide\\.init(?:\\.min)?\\.js",
"website": "http://www.translucide.net" "website": "http://www.translucide.net"
}, },
"Tumblr": { "Tumblr": {

Loading…
Cancel
Save