From e4cadb22394599a2f508078ff5b1e8889944475e Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 11 Jan 2018 14:51:24 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend.git into develop

---
 e2e/app.e2e-spec.ts |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/e2e/app.e2e-spec.ts b/e2e/app.e2e-spec.ts
index cedad8f..1140f84 100644
--- a/e2e/app.e2e-spec.ts
+++ b/e2e/app.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { AppPage } from './app.po';
 
-describe('screen-frontend App', () => {
+describe('ng-alain App', () => {
   let page: AppPage;
 
   beforeEach(() => {

--
Gitblit v1.8.0