.

content/contents/default.blade.php

@@ -57,11 +57,7 @@
                     <div class="col-lg-8">
                         <div class="inf">
                             <div class="text color-666 mb-20">
-<<<<<<< HEAD
                                 {{$content->beschreibung}}
-=======
-                                {{$content->short_description}}
->>>>>>> 83f15e6d8b628abe7ee914c80d12a85bf0e5e2ff
                             </div>
 
                         </div>
@@ -108,10 +104,8 @@
                 </div>
             </div>
         </div>
-        <!-- ====== end challenge ====== -->
 
 
-        <!-- ====== start screenshots  ====== -->
         <div class="screenshots style-4 d-none">
             <div class="screenshots-slider style-4">
                 <div class="swiper-container">