解决冲突

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;
   }