Fix local branch merge conflict

main
Fernando Poumián 7 years ago
commit 96a8a830aa

@ -6163,7 +6163,7 @@
"1", "1",
"11" "11"
], ],
"html": [ "html":[
"<[^>]+id=\"phenomic(?:root)?\"" "<[^>]+id=\"phenomic(?:root)?\""
], ],
"icon": "Phenomic.svg", "icon": "Phenomic.svg",

Loading…
Cancel
Save