Merge branch 'stage_tsit' of

https://style24@dev.azure.com/style24/style24/_git/style24.front into
stage_tsit

Conflicts:
	src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html
	src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -25,7 +25,11 @@
 <script src="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
 
 <!-- 스타일데이 -->
+<<<<<<< HEAD
 <script src="https://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+=======
+<script src="http://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+>>>>>>> branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.front
 <script th:if="${planInfo.planSq}==38">
 	$(function(){
 		$('.gift_slider').bxSlider({

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -24,7 +24,11 @@
 <script src="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
 
 <!-- 스타일데이 -->
+<<<<<<< HEAD
 <script src="https://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+=======
+<script src="http://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+>>>>>>> branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.front
 <script th:if="${planInfo.planSq}==38">
 	openWindow = function() {
 	  	var popupX = (document.body.offsetWidth / 2) - (800 / 2);