소스 충돌 처리

src/main/webapp/WEB-INF/jsp/nlib/member/accountConsolidationForm.jsp

@@ -61,7 +61,7 @@
                                 <c:if test="${oauthUser.snsType eq 'GOOGLE'}">구글</c:if>
                              </span>계정이 통합되었습니다.
                             </p>
-                            <p><button type="button"><span class="name"><c:out value="${NlibLoginVO.name }"/></span><span class="mail"><c:out value="${NlibLoginVO.email }"/></span></button></p>
+                            <p><button type="button"><span class="name"><c:out value="${result.name }"/></span><span class="mail"><c:out value="${result.email }"/></span></button></p>
                         </div>
                         <div class="box">
                             <div class="icon">