From 6dc584101ab840cbabbb54fcaef3ca6074f59ec5 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 24 Mar 2021 22:38:15 +0800
Subject: [PATCH] 重置
---
src/page/index/logo.vue | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 2881327..18b89eb 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
<template>
<div class="avue-logo">
<transition name="fade">
@@ -906,4 +904,3 @@
box-sizing: border-box;
}
</style>
->>>>>>> 117aadb12c2bb9867b0e48939ee1a412eef5a7b9
--
Gitblit v1.9.3