Fix local branch merge conflict

main
Fernando Poumián 8 years ago
commit 96a8a830aa

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