From 02d7781ca73855f9dc6e68c3319371e263c32ca2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CSalar?= <“salar.sali97@gmail.com”>
Date: Wed, 17 Aug 2022 12:56:34 +0300
Subject: [PATCH] header App.tsx

---
 src/App.tsx | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index fa9d206..a9b829d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,6 +4,7 @@
 import React from "react";
 import classNames from "classnames";
 import Inputgroup from "components/Inputgroup";
+import Header1 from "components/Header1";
 
 /* -------------------------------------------------------------------------- */
 /*                         Application root component                         */
@@ -13,37 +14,11 @@ import Inputgroup from "components/Inputgroup";
  * @return {JSX.Element}
  */
 function App() {
-<<<<<<< Updated upstream
-  return <div>Hello world!</div>;
-=======
   return (
     <div>
-      <Inputgroup className="bg-red-500 pt-4">
-        <select className="w-1/4 h-9 bg-white text-base">
-          <option>Apps</option>
-        </select>
-
-        <input
-          className={classNames(
-            "flex grow shrink basis-auto m-1 p-1 text-base hover:placeholder:text-slate-300 hover:duration-1200 "
-          )}
-          placeholder="Search.."
-          type="text"
-        />
-        <Inputgroup>
-          {" "}
-          <input
-            className={classNames(
-              "flex grow shrink basis-auto m-1 p-1 text-base hover:placeholder:text-slate-300 hover:duration-1200 "
-            )}
-            placeholder="Search.."
-            type="text"
-          />
-        </Inputgroup>
-      </Inputgroup>
+      <Header1 />
     </div>
   );
->>>>>>> Stashed changes
 }
 
 export default App;