From 09e95982e57f1a26be4249d11091a935544df684 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 16 Jan 2018 16:57:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 .angular-cli.json |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/.angular-cli.json b/.angular-cli.json
index 71940fd..c11dab3 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": {

--
Gitblit v1.8.0