Conflict fix

This commit is contained in:
DwCay
2022-05-31 13:58:27 +03:00
parent 5b1ff31e01
commit de11c6be0f

View File

@@ -106,15 +106,12 @@ function ValidationLog () {
<div className="flex h-screen overflow-hidden"> <div className="flex h-screen overflow-hidden">
{/* Sidebar */} {/* Sidebar */}
<Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} /> <Sidebar sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
{/* Content area */} {/* Content area */}
<div className="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden"> <div className="relative flex flex-col flex-1 overflow-y-auto overflow-x-hidden">
{/* Site header */} {/* Site header */}
<Header sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} /> <Header sidebarOpen={sidebarOpen} setSidebarOpen={setSidebarOpen} />
<main> <main>
<div className="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto"> <div className="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
{/* Page header */} {/* Page header */}
<div className="pb-8 border-b border-zinc-200"> <div className="pb-8 border-b border-zinc-200">
{/* Title */} {/* Title */}
@@ -183,7 +180,6 @@ function ValidationLog () {
</div> </div>
</div> </div>
</main> </main>
</div> </div>
</div> </div>
) )