diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp index e8ed0174..3cb7c913 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp @@ -1,441 +1,3 @@ -<<<<<<< HEAD -<% -/** - *
- * @Class Name : selectItemInfo.jsp - * - * @Description : 소장자료 상세내용을 조회한다. - * - * - * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) - * - *- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 30. JSYOO 최초 생성 - * @ 2021.10. 28. KNKIM 대출예약, 방문열람신청, 카트담기 연결 처리 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 7. 30. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> - - -