修改冲突

qingdan.html

@@ -40,12 +40,6 @@
         <div class="container-fluid">
           <div class="row">
             <div class="main-content col-lg-7 p-0">
-<<<<<<< HEAD
-              11
-            </div>
-            <div class="main-side col-lg-5 p-0">
-              22
-=======
                 <table class="table table-bordered">
                   <thead>
                     <tr>
@@ -254,8 +248,7 @@
                     </div>
                   </div>
                 </div>
-              </div> 
->>>>>>> c82e0cae4a083e912151caafcd3118a41cf1b284
+              </div>
             </div>
           </div>
         </div>