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 |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index a5116c5..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', //  怨듯넻 而⑦듃濡ㅻ윭
@@ -101,6 +101,7 @@
         'memberProgressWidget' : '../custom_components/widget/member-progress-widget/member-progress-widget.directive', //  硫ㅻ쾭蹂� 吏꾪뻾瑜� 李⑦듃瑜� �꽔�뒗�뜲 �궗�슜�븳�떎.
         'projectProgressWidget' : '../custom_components/widget/project-progress-widget/project-progress-widget.directive',  //  吏꾪뻾 以묒씤 �봽濡쒖젥�듃 �쁽�솴 李⑦듃瑜� �꽔�뒗�뜲 �궗�슜�븳�떎.
         'projectMemberListController' : '../custom_components/widget/project-progress-widget/projectMemberList.controller', //  吏꾪뻾 以묒씤 �봽濡쒖젥�듃 �쁽�솴 李⑦듃�뿉�꽌 ���썝 �솗�씤�뿉 �궗�슜�븳�떎.
+        'projectDepartmentListController' : '../custom_components/widget/project-progress-widget/projectDepartmentList.controller',
         'issueStatisticsWidget' : '../custom_components/widget/issue-statistics-widget/issue-statistics-widget.directive',  //  �쟾泥� �씠�뒋 �쁽�솴 李⑦듃瑜� �꽔�뒗�뜲 �궗�슜�븳�떎.
         'workflowWidget' : '../custom_components/widget/workflow-widget/workflow-widget.directive', //  �썙�겕�뵆濡쒖슦 李⑦듃瑜� �꽔�뒗�뜲 �궗�슜�븳�떎.
         'issueTypeWidget' : '../custom_components/widget/issue-type-widget/issue-type-widget.directive',    //  �씠�뒋 ���엯 蹂� �씠�뒋 �쁽�솴 李⑦듃瑜� �꽔�뒗�뜲 �궗�슜�븳�떎.
@@ -183,7 +184,9 @@
         'issueImportExcelController' : 'app/issue/issueImportExcel.controller',    //  �씠�뒋 �뿊�� ���웾 import
         'issueModifyStatusController' : 'app/issue/issueModifyStatus.controller',   //  �씠�뒋 �떎以� �긽�깭 蹂�寃� 而⑦듃濡ㅻ윭
         'issueAddTableConfigController' : 'app/issue/issueAddTableConfig.controller',   //  �씠�뒋 �뀒�씠釉� �꽕�젙 而⑦듃濡ㅻ윭
-        'issueSendMailController' : 'app/issue/issueSendMail.controller',   //  �씠�뒋 �씠硫붿씪 諛쒖넚 而⑦듃濡ㅻ윭
+        'issueAddRelationTableConfigController' : 'app/issue/issueAddRelationTableConfig.controller',   //  �씠�뒋 �뀒�씠釉� �꽕�젙 而⑦듃濡ㅻ윭
+        'issueAddDownTableConfigController' : 'app/issue/issueAddDownTableConfig.controller',   //  �씠�뒋 �뀒�씠釉� �꽕�젙 而⑦듃濡ㅻ윭
+        'issueSendMailPartnersController' : 'app/issue/issueSendMailPartners.controller',   //  �씠�뒋 �씠硫붿씪 諛쒖넚 而⑦듃濡ㅻ윭
         'issueVersionViewController' : 'app/issue/issueVersionView.controller', //  �씠�뒋 踰꾩쟾 �솗�씤 而⑦듃濡ㅻ윭
         'issueReservationController' : 'app/issue/issueReservation.controller', //  �씠�뒋 諛쒖깮 �삁�빟 而⑦듃濡ㅻ윭
         'issueModifyUserController' : 'app/issue/issueModifyUser.controller', // �씠�뒋 �떞�떦�옄 而⑦듃濡ㅻ윭
@@ -520,6 +523,7 @@
     'authService',
     'userInviteService',
     'projectService',
+    'customFieldService',
     'loginRoute',
     'projectRoute',
     'issueStatusRoute',

--
Gitblit v1.8.0