From 79b53a016dde2acb69119f92d6b1ec371e28a1a3 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <christophe@nexedi.com>
Date: Fri, 14 Apr 2006 11:39:38 +0000
Subject: [PATCH] - added support for conflicted/replaced files
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6642 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 30b21b1f3a..e2a90f967a 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
--
2.30.9