From ec700318ae079b8d384f1515aba12fa89951026b Mon Sep 17 00:00:00 2001
From: DwCay <duminalexei@gmail.com>
Date: Tue, 31 May 2022 13:58:27 +0300
Subject: [PATCH] Conflict fix

---
 src/pages/digitalId/Validate.jsx      | 3 ---
 src/pages/digitalId/ValidationLog.jsx | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/src/pages/digitalId/Validate.jsx b/src/pages/digitalId/Validate.jsx
index 4ca3300..80978fe 100644
--- a/src/pages/digitalId/Validate.jsx
+++ b/src/pages/digitalId/Validate.jsx
@@ -65,12 +65,10 @@ function Validate () {
     <div className="flex h-screen overflow-hidden">
       {/* Sidebar */}
       <Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
-
       {/* Content area */}
       <div className="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden">
         {/*  Site header */}
         <Header sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
-
         <main>
           <div className="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
             <div className="w-fit">
@@ -115,7 +113,6 @@ function Validate () {
           </div>
           <ValidatePanel validatePanelOpen={validatePanelOpen} setValidatePanelOpen={setValidatePanelOpen}/>
         </main>
-
       </div>
     </div>
   )
diff --git a/src/pages/digitalId/ValidationLog.jsx b/src/pages/digitalId/ValidationLog.jsx
index 02d9a13..77a9cec 100644
--- a/src/pages/digitalId/ValidationLog.jsx
+++ b/src/pages/digitalId/ValidationLog.jsx
@@ -106,15 +106,12 @@ function ValidationLog () {
       <div className="flex h-screen overflow-hidden">
         {/* Sidebar */}
         <Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
-
         {/* Content area */}
         <div className="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden">
           {/*  Site header */}
           <Header sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
-
           <main>
             <div className="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
-
               {/* Page header */}
               <div className="pb-8 border-b border-zinc-200">
                 {/* Title */}
@@ -183,7 +180,6 @@ function ValidationLog () {
               </div>
             </div>
           </main>
-
         </div>
       </div>
   )