]> source.dussan.org Git - archiva.git/commit
[MRM-980] fixed variable names in action and label/messages in jsp
authorMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 04:03:00 +0000 (04:03 +0000)
committerMaria Odea B. Ching <oching@apache.org>
Sun, 1 Aug 2010 04:03:00 +0000 (04:03 +0000)
commitb12f6e842648ed07e4bafbf6bba54bd66b18ea1c
tree0e277dcffb93d81613622b53f37ea290c88691d9
parent1014b00be4064973f807ae252734ea29e894417e
[MRM-980] fixed variable names in action and label/messages in jsp

git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981136 13f79535-47bb-0310-9956-ffa450edef68
archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeAction.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeActionResults.jsp
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/mergeExcludeConflicts.jsp