From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
.angular-cli.json | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/.angular-cli.json b/.angular-cli.json
index 71940fd..6eaae58 100644
--- a/.angular-cli.json
+++ b/.angular-cli.json
@@ -23,7 +23,7 @@
"scripts": [
"../node_modules/@antv/g2/dist/g2.min.js",
"../node_modules/@antv/data-set/dist/data-set.min.js",
- "../node_modules/@antv/g2-plugin-slider/dist/g-2.0.0.min.js"
+ "../node_modules/@antv/g2-plugin-slider/dist/g2-plugin-slider.min.js"
],
"environmentSource": "environments/environment.ts",
"environments": {
@@ -57,6 +57,9 @@
}
},
"defaults": {
+ "schematics": {
+ "collection": "@delon/cli"
+ },
"styleExt": "less",
"class": {
"spec": false
--
Gitblit v1.8.0