Author: oching
Date: Tue Jul 27 06:24:40 2010
New Revision: 979550
URL: http://svn.apache.org/viewvc?rev=979550&view=rev
Log:
[MRM-980] fixed button value names
Modified:
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
Modified:
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
URL:
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp?rev=979550&r1=979549&r2=979550&view=diff
==============================================================================
---
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
(original)
+++
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
Tue Jul 27 06:24:40 2010
@@ -71,7 +71,7 @@
<table>
<tr>
<td>
- <s:submit value="MergeAll" method="doMerge"/>
+ <s:submit value="Merge All" method="doMerge"/>
</td>
</tr>
</table>
@@ -80,7 +80,7 @@
<table>
<tr>
<td>
- <s:submit value="Merge With Skipp"
method="mergeBySkippingConflicts"/>
+ <s:submit value="Merge With Skip"
method="mergeBySkippingConflicts"/>
</td>
</tr>
</table>
