From 45cfbc7326bcc51064bc5c7d49f2cec50a62d259 Mon Sep 17 00:00:00 2001
From: IIROFESSOR-X <IIROFESSOR@gmail.com>
Date: Wed, 4 Oct 2023 21:26:19 +0300
Subject: [PATCH] mark 11

---
 src/partials/your-order.html | 82 +-----------------------------------
 1 file changed, 2 insertions(+), 80 deletions(-)
diff --git a/src/partials/your-order.html b/src/partials/your-order.html
index 0cb3a39..fb00704 100644
--- a/src/partials/your-order.html
+++ b/src/partials/your-order.html
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 <section class="order-section">
   <div class="order-bg-img">
     <h2 class="order-title visually-hidden">Your order</h2>
@@ -67,82 +67,4 @@ <h2 class="order-title">
       />
     </div>
   </div>
-</section>
-=======
-<!-- <!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Document</title>
-  </head>
-  <body> -->
-<section class="order-section">
-  <div class="order-bg-img">
-    <h2 class="order-title visually-hidden">Your order</h2>
-  </div>
-  <div class="order-container" id="button-order">
-    <div class="order-form-container">
-      <h2 class="order-title">
-        <span class="order-title-orig">Your order </span>
-        is our priority: Personalized approach and quality of service
-      </h2>
-      <form class="order-form">
-        <div class="order-form-input-wrapper">
-          <input
-            type="text"
-            class="order-form-input"
-            name="user-name"
-            pattern="[a-zA-Zа-яА-ЯіІїЇєЄҐґ']+"
-            placeholder="Enter your full name"
-            required
-          />
-        </div>
-        <div class="order-form-input-wrapper">
-          <input
-            type="email"
-            class="order-form-input"
-            name="user_email"
-            placeholder="Enter your email"
-            required
-          />
-        </div>
-        <div class="order-form-field-wrapper-comment">
-          <textarea
-            class="order-form-comment"
-            name="user-comment"
-            placeholder="Comments"
-          ></textarea>
-        </div>
-        <div class="order-btn">
-          <button class="order-form-submit" type="submit">
-            Send
-            <svg
-              class="order-btn-icon"
-              width="90"
-              height="22"
-              aria-label="icon arrow"
-            >
-              <use href="../public/icons.svg#icon-arrow"></use>
-            </svg>
-          </button>
-        </div>
-      </form>
-    </div>
-    <img
-      class="order-img"
-      srcset="
-        ./img/your-order/order-img-524w.jpg   524w,
-        ./img/your-order/order-img-1048w.jpg 1048w,
-        ./img/your-order/order-img-638w.jpg   638w,
-        ./img/your-order/order-img-1276w.jpg 1276w
-      "
-      sizes="(min-width: 1280px) 524px, (min-width: 768px) 638px"
-      src="./img/your-order/order-img-638w.jpg"
-      alt="order image"
-    />
-  </div>
-</section>
-<!-- </body>
-</html> -->
->>>>>>> 3ca45f9713de897d673b389c437f74d7a2f8c9c8
+</section>
\ No newline at end of file
