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/app/api/api.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/scripts/app/api/api.js b/src/main/webapp/scripts/app/api/api.js
index 3449369..41a70f0 100644
--- a/src/main/webapp/scripts/app/api/api.js
+++ b/src/main/webapp/scripts/app/api/api.js
@@ -71,7 +71,7 @@
loadController : ["$q", function ($q) {
var deferred = $q.defer();
require(["apiMonitorController",
- "apiService", 'formSubmit', 'jsShortCut', 'inputRegex'], function () {
+ "apiService", 'formSubmit', 'jsShortCut', 'inputRegex', 'googleChart'], function () {
deferred.resolve();
});
--
Gitblit v1.8.0