[MRM-980] fixed button value names

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@979550 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
index 720675a5cb58212a732cafc2841e55ebc015999e..be89c6bf347d5605d70d61f61a760298e44e261d 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp
@@ -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>