From ddb40fafd26cee98f06da976ada1144697664dfd Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Sat, 24 Feb 2018 11:46:40 +0800
Subject: [PATCH] Copyright
---
src/app/layout/passport/passport.component.html | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html
index bd672de..cd0480b 100644
--- a/src/app/layout/passport/passport.component.html
+++ b/src/app/layout/passport/passport.component.html
@@ -11,11 +11,7 @@
<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