
# resolved conflicts: # admin/panels/config/admin.config.tpl # admin/panels/entry/admin.entry.commentlist.tpl # fp-plugins/commentcenter/tpls/deletecomm.tpl # fp-plugins/commentcenter/tpls/editpol.tpl
# resolved conflicts: # admin/panels/config/admin.config.tpl # admin/panels/entry/admin.entry.commentlist.tpl # fp-plugins/commentcenter/tpls/deletecomm.tpl # fp-plugins/commentcenter/tpls/editpol.tpl