Update App.js

resolve merge conflict
attreyee-muk · Oct 3, 2021 · d4f26e6 · d4f26e6
1 parent 999b7cb
commit d4f26e6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/App.js b/src/App.js
@@ -30,6 +30,7 @@ const App = () => {
   return (
     <BrowserRouter>
       <AuthProvider>
+<<<<<<< HEAD
         <div className="relative grid min-h-screen md:grid-cols-layout-tablet xl:grid-cols-layout-desktop grid-rows-layout-desktop md:gap-6">
 =======
         <div className="relative grid md:grid-cols-layout-tablet xl:grid-cols-layout-desktop grid-rows-layout-desktop md:gap-6">