From: Maria Odea B. Ching Date: Sun, 1 Aug 2010 04:48:24 +0000 (+0000) Subject: [MRM-980] remove unused jsp X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee1c46df0498a24d941fcf188a93a439d12a6325;p=archiva.git [MRM-980] remove unused jsp git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@981150 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp deleted file mode 100644 index 60a041e35..000000000 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/mergeAction.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --%> - -<%-- http://www.opensymphony.com/webwork/wikidocs/File%20Upload%20Interceptor.html --%> - -<%@ page contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - Admin: Merge Staging Repository - - - - -

Admin: Merge Staging Repository

- -

- - - - - - <%----%> - <%--<%@ include file="/WEB-INF/jsp/include/mergeActionForm.jspf" %>--%> - - - -

- - -