.

2023-05-09 09:52:12 +02:00 · 2023-05-09 09:52:12 +02:00 · c657e1ac12
parent 2fcd074353 83f15e6d8b
commit c657e1ac12
1 changed files with 4 additions and 0 deletions
--- a/content/contents/default.blade.php
+++ b/content/contents/default.blade.php
@ -57,7 +57,11 @@
                    <div class="col-lg-8">
                        <div class="inf">
                            <div class="text color-666 mb-20">
+<<<<<<< HEAD
                                {{$content->beschreibung}}
+=======
+                                {{$content->short_description}}
+>>>>>>> 83f15e6d8b628abe7ee914c80d12a85bf0e5e2ff
                            </div>

                        </div>