merge complete

src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java

@@ -97,26 +97,11 @@ public class AdjstExpController {
 		
 		
 		adjstReqVO.setStep(KccadrConstants.STEP6);
-
-<<<<<<< HEAD
-		// 오라클 연동 테스트 > 여현준
-//		sMSOracleService.selectOracleTest();
-//		AdjReqMgrVO adjReqMgrVO = new AdjReqMgrVO();
-//		adjReqMgrVO.setAdrSeq("ADR_0000000000000381");
-//		adjReqMgrVO.setStatCd("104010");
-//		sMSOracleService.insertSmsSend(adjReqMgrVO);
-		
-		//로그인 권한정보 불러오기
-//		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
-//		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId());
-		
 		
 		model.addAttribute("crtfcSn", "N");
-=======
 		String crtfcSn = "N";
 		
 		model.addAttribute("crtfcSn", crtfcSn);
->>>>>>> refs/heads/anjooyoung
 		
 		return "/web/kccadr/adjstExp/adjstReqRegistInformation";
 	}