修复简介显示BUG

lonely-starry · Apr 28, 2024 · bf96872 · bf96872
1 parent c4a494a
commit bf96872
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/components/Message.vue b/src/components/Message.vue
@@ -15,19 +15,12 @@
         <Icon size="16">
           <QuoteLeft />
         </Icon>
-<<<<<<< HEAD
         <Transition name="fade" mode="out-in">
           <div :key="descriptionText.hello + descriptionText.text" class="text">
             <p>{{ descriptionText.hello }}</p>
             <p>{{ descriptionText.text }}</p>
           </div>
         </Transition>
-=======
-        <div class="text">
-          <p>{{ descriptionText.hello }}</p>
-          <p>{{ descriptionText.text }}</p>
-        </div>
->>>>>>> skyhome/dev
         <Icon size="16">
           <QuoteRight />
         </Icon>