up

laraxot · Jan 19, 2024 · 91b5b89 · 91b5b89
1 parent 6a4705d
commit 91b5b89
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 36 deletions.
diff --git a/Resources/views/components/std/card.blade.php b/Resources/views/components/std/card.blade.php
@@ -11,19 +11,7 @@ class="h-[200px] w-full object-cover object-center bg-gray-100"
         <h2 class="mt-3 text-xl">{{ $post->title }}</h2>
     </a>
     <div class="mt-1">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
         {{-- must be inside BLOG Module
-=======
-        {{-- must be inside BLOG Module 
->>>>>>> 4231555 (up)
-=======
-        {{-- must be inside BLOG Module
->>>>>>> e6e8a9f (Dusting)
-=======
-        {{-- must be inside BLOG Module
->>>>>>> 1fc11dff398b839dde09cb28df19761ba6bd759f
         <x-post-meta :post="$post" />
         --}}
     </div>

diff --git a/Resources/views/components/std/post-footer.blade.php b/Resources/views/components/std/post-footer.blade.php
@@ -5,19 +5,7 @@
         <h2>See also</h2>
 
         <div class="grid gap-4 grid-cols-1 sm:grid-cols-2">
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
             {{-- OBSOLETE
-=======
-            {{-- OBSOLETE 
->>>>>>> 922b101 (up)
-=======
-            {{-- OBSOLETE
->>>>>>> 1fc11df (Dusting)
-=======
-            {{-- OBSOLETE
->>>>>>> 1fc11dff398b839dde09cb28df19761ba6bd759f
             <x-render-blocks :blocks="$blocks" />
             --}}
         </div>

diff --git a/Resources/views/components/std/render-blocks.blade.php b/Resources/views/components/std/render-blocks.blade.php
@@ -1,19 +1,7 @@
 @props(['blocks'])
 
 @foreach ($blocks as $block)
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     {{-- OBSOLETE
-=======
-    {{-- OBSOLETE 
->>>>>>> 922b101 (up)
-=======
-    {{-- OBSOLETE
->>>>>>> 1fc11df (Dusting)
-=======
-    {{-- OBSOLETE
->>>>>>> 1fc11dff398b839dde09cb28df19761ba6bd759f
     <x-render-block :block="$block" />
     --}}
 @endforeach