final (pas fini)

resources/index.html

@@ -16,15 +16,9 @@
     <img class="container__menu__logo" src="assets/images/logo.svg" alt="Logo">
     <nav class="container__menu__link">
       <ul>
-<<<<<<< HEAD
-        <li><a class="container__menu__link__blanc" href="#">About</a></li>
-        <li><a class="container__menu__link__blanc" href="#">Services</a></li>
-        <li><a class="container__menu__link__blanc" href="#">Projects</a></li>
-=======
         <li><a href="#">About</a></li>
         <li><a href="#">Services</a></li>
         <li><a href="#">Projects</a></li>
->>>>>>> dev
         <li class="container__menu__link__btn"><a href="#">Contact</a></li>
       </ul>
     </nav>
@@ -114,31 +108,9 @@ <h3 class="feature__content__subtitle service__bloc__titre">Photography</h3>
     </section>
   </article>
 
-<!-- TESTIMONIALS -->
+  <!-- TESTIMONIALS -->
 
   <section class="testimonials">
-<!--  HEAD  -->
-    <h3>Client testimonials</h3>
-    <div class="testimonials__row">
-      <div class="testimonials__col">
-        <img src="assets/images/people/image-emily.jpg" alt="Emily R.">
-        <p>
-          We put our trust in Sunnyside and they delivered, making sure our needs were met and deadlines were always
-          hit.
-        </p>
-        <div class="client-name">
-          <h4>Emily R.</h4>
-          <p>Marketing Director</p>
-        </div>
-      </div>
-      <div class="testimonial-col">
-        <img src="assets/images/people/image-thomas.jpg" alt="Thomas S.">
-        <p>
-          Sunnyside’s enthusiasm coupled with their keen interest in our brand’s success made it a satisfying and
-          enjoyable experience.
-        </p>
-        <div class="client-name">
-=======
     <h3 class="client">Client testimonials</h3>
     <div class="testimonials__row">
       <div class="testimonials__col">
@@ -159,25 +131,16 @@ <h4>Emily R.</h4>
           enjoyable experience.
         </p>
         <div class="testimonials__col__name">
->>>>>>> dev
           <h4>Thomas S.</h4>
           <p>Chief Operating Officer</p>
         </div>
       </div>
       <div class="testimonial-col">
-<<<<<<< HEAD
-        <img src="assets/images/people/image-jennie.jpg" alt="Jennie F.">
-        <p>
-          Incredible end result! Our sales increased over 400% when we worked with Sunnyside. Highly recommended!
-        </p>
-        <div class="client-name">
-=======
         <img class="testimonials__col__img" src="assets/images/people/image-jennie.jpg" alt="Jennie F.">
         <p class="testimonials__col__explain">
           Incredible end result! Our sales increased over 400% when we worked with Sunnyside. Highly recommended!
         </p>
         <div class="testimonials__col__name">
->>>>>>> dev
           <h4>Jennie F.</h4>
           <p>Business Owner</p>
         </div>