From a73dea1555a2c4f9688d344a07cbc79c1b9e058c Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 24 Feb 2018 11:45:17 +0800
Subject: [PATCH] 添加 coockie
---
src/app/layout/passport/passport.component.html | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html
index 20d6ddc..bd672de 100644
--- a/src/app/layout/passport/passport.component.html
+++ b/src/app/layout/passport/passport.component.html
@@ -11,7 +11,11 @@
<router-outlet></router-outlet>
<global-footer>
<ng-template #copyright>
+<<<<<<< HEAD
Copyright <nz-icon nzType="copyright"></nz-icon> 2018 <a href="http://www.7drlb.com/" target="_blank">������������</a>������
+=======
+ Copyright <nz-icon nzType="copyright"></nz-icon> 2018 <a href="http://www.7drlb.com/" target="_blank">������������������������</a>
+>>>>>>> 9e00209b2f1147759d4935e99f4c6ce3db0cb9a5
</ng-template>
</global-footer>
</div>
--
Gitblit v1.8.0