From 6a72a3edec87cca9996c7ab3be3fd48479881945 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 02 12월 2021 21:55:28 +0900
Subject: [PATCH] 충돌 수정

---
 src/main/webapp/scripts/main.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index c19a0e9..597c614 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -49,8 +49,8 @@
         'htmlDiff' : '/bower_components/htmldiff/js/htmldiff',  //  �씠�뒋 �궡�슜 蹂�寃� 鍮꾧탳瑜� �쐞�빐 �궗�슜
         'bootstrapUtil' : '../custom_components/bootstrap/js/dist/util',    //  �룄��留� �댋�똻�쓣 �쐞�빐 �궗�슜
         'tooltip' : '../custom_components/bootstrap/js/dist/tooltip',   //  �룄��留� �댋�엯�쓣 �쐞�빐 �궗�슜
-
-
+        'googleChartLoader' : '../custom_components/google-chart/loader', // 援ш� 李⑦듃 濡쒕뜑
+        'googleChart' : '../custom_components/google-chart/googleChart.directive', // 援ш� 李⑦듃 濡쒕뜑
 
         'angularTranslate' : '../custom_components/angular-translate/angular-translate', //  �떎援��뼱 泥섎━�뿉 �궗�슜
         'commonController' : 'app/common/common.controller', //  怨듯넻 而⑦듃濡ㅻ윭

--
Gitblit v1.8.0