From d910569d8319c1be4f2ba6dd725a45b4c3fe76ef Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 27 Jun 2022 16:39:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/home/search.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/home/search.js b/public/home/search.js
index 94a252554..86b2ad06e 100644
--- a/public/home/search.js
+++ b/public/home/search.js
@@ -918,11 +918,8 @@ function LetterAvatar(name, size, color) {
   } else {
     initials = nameSplit[0].charAt(0) + nameSplit[1].charAt(0);
   }
-<<<<<<< HEAD
   let initials1 = initials.toUpperCase();
   initials.toUpperCase();
-=======
->>>>>>> V20220630
   if (w.devicePixelRatio) {
     size = size * w.devicePixelRatio;
   }