fix merge conflict

views/DE/project/projectList.pug

@@ -6,10 +6,7 @@ html(lang="de")
     meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
     link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css")
     link(rel="stylesheet", type="text/css", href="/css/m4lab.css")
-<<<<<<< HEAD
-=======
     link(rel="stylesheet", type="text/css", href="/css/m4lab-mobile.css")
->>>>>>> testing
     link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
     style.
         .title-container {
@@ -52,15 +49,9 @@ html(lang="de")
         }
   body
     div(class="container")
-<<<<<<< HEAD
-            div(class="row")
-                div(class="col-md-12 margin_bottom_40")
-                    img(class="mx-auto" src="/img/ProjektcodeDaten.png" width="100%")
-=======
         div(class="row")
             div(class="col-md-12 margin_bottom_40")
                 img(class="mx-auto" src="https://transfer.hft-stuttgart.de/img/ProjektcodeDaten.png" width="100%")
->>>>>>> testing
     div(class="container")
         p Hier finden Sie den direkten Zugang zu den Inhalten der bei uns gehosteten Projekte.
         p Weitere Informationen zu den bei uns gehosteten Projekten finden Sie <a href="/projektinformationen">hier</a>.
@@ -80,11 +71,7 @@ html(lang="de")
             | <div class="row">
             for item in project
                 div(class="card-deck py-4 col-sm")
-<<<<<<< HEAD
-                    div(class="card width_18")
-=======
                     div(class="card card-portrait" style="transform: rotate(0);")
->>>>>>> testing
                         div(class="title-container")
                             div(class="card-img-bg" style=`background-image: url(${item.logo});`)
                             img(class="card-img-top", src=item.logo)
@@ -97,16 +84,8 @@ html(lang="de")
                                         | &nbsp;
                             div(class="row")
                                 div(class="col-9")
-<<<<<<< HEAD
-                                    p(class="card-text") #{item.desc}
-                                a(href=item.weburl, class="no_text_decoration", target="_blank")
-                                    div(class="col-3")
-                                        svg(class="bi bi-chevron-right", width="32", height="32", viewBox="0 0 20 20", fill="black", xmlns="http://www.w3.org/2000/svg")
-                                            | <path fill-rule="evenodd" d="M6.646 3.646a.5.5 0 01.708 0l6 6a.5.5 0 010 .708l-6 6a.5.5 0 01-.708-.708L12.293 10 6.646 4.354a.5.5 0 010-.708z"></path>
-=======
                                     p(class="card-text clamp-lines") #{item.desc}
                                 a(href=item.weburl, class="no_text_decoration stretched-link", target="_blank")
->>>>>>> testing
             | </div>
 
     button(onclick="topFunction()" id="topBtn")