diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml index 30b21b1f3ab4dfb45a4b54a3a63a4b9651e0f6fd..e2a90f967a4c6cff78d404dd1597aa403cee5313 100644 --- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml +++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml @@ -125,7 +125,8 @@ here/BusinessTemplate_doCreateJavaScriptStatus">javascript here</tal:js>\n <tr><td> </td></tr>\n <tr><td><font color="green" size="1">Added File</font></td></tr>\n <tr><td><font color="orange" size="1">Modified File</font></td></tr>\n - <tr><td><font color="red" size="1">Deleted File</font></td></tr></table>\n + <tr><td><font color="red" size="1">Deleted File</font></td></tr>\n + <tr><td><font color="grey" size="1">Conflicted File</font></td></tr></table>\n <br><br>\n </td>\n \t</tr>\n