From 60b58b47cecd7611ad8df2561a84bf0548ad6ad9 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Wed, 20 Dec 2017 13:54:45 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop

---
 package-lock.json |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0a9a570..e69daf1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
-  "name": "screen-frontend",
-  "version": "0.0.0",
+  "name": "ng-alain",
+  "version": "0.3.0-rc.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

--
Gitblit v1.8.0