no message

src/pages/deepseek/questionAnswer/info/index.tsx

@@ -700,13 +700,7 @@ const QuestionAnswerInfo: React.FC = () => {
                                 </div>
                             </Splitter.Panel>
                             <Splitter.Panel defaultSize="35%">
-
-<<<<<<< HEAD
                                 <div className='flex-center-container'>
-=======
-
-                                                                    <div className='flex-center-container'>
->>>>>>> 469e9491df0b84dc31b438b2f28f5964a3002202
                                     <div className='half-width'>
                                         <div className='flex-center-top'>
                                             欢迎使用 {name}