From 2ad2be46e8decbcf76a55026bce580eebca8d7e5 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 23 Aug 2021 14:50:24 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/ui/reset/reset.component.html | 7 +------ src/app/ui/reset/reset.component.ts | 3 ++- src/index.html | 6 +----- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/app/ui/reset/reset.component.html b/src/app/ui/reset/reset.component.html index 0326b06..798c65e 100644 --- a/src/app/ui/reset/reset.component.html +++ b/src/app/ui/reset/reset.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-25 08:48:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-08-23 14:47:08 + * @LastEditTime: 2021-08-23 14:50:04 --> @@ -26,12 +26,7 @@ -<<<<<<< HEAD -======= -
-
->>>>>>> 013e5da7c002990e9063f0e2dec8cf22e702765f @@ -28,9 +28,5 @@ --> -<<<<<<< HEAD -======= - ->>>>>>> 013e5da7c002990e9063f0e2dec8cf22e702765f