From 68576692f844a970b517483b99d1925bdd46722b Mon Sep 17 00:00:00 2001
From: supergrecko <business@supergrecko.com>
Date: Sat, 27 Jul 2019 01:18:52 +0200
Subject: [PATCH] Fix conflict

---
 src/components/Navbar/index.tsx | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/components/Navbar/index.tsx b/src/components/Navbar/index.tsx
index 560ff61..52a7750 100644
--- a/src/components/Navbar/index.tsx
+++ b/src/components/Navbar/index.tsx
@@ -41,28 +41,3 @@ Navbar.defaultProps = {
 }
 
 export default Navbar;
-=======
-const Navbar = ({ siteTitle = "" }) => (
-  <NavbarWrapper>
-    <NavbarItems>
-      {/* <img src={icon} style={{ width: "70px" }} /> */}
-      <h1 style={{ margin: 0 }}>
-        <Link
-          to="/"
-          style={{
-            color: `white`,
-            textDecoration: `none`,
-          }}
-        >
-          {siteTitle}
-        </Link>
-      </h1>
-    </NavbarItems>
-    <NavbarItems>
-      <button>discord link here</button>
-      <button>reddit (maybe?) link here</button>
-    </NavbarItems>
-  </NavbarWrapper>
-)
-
-export default Navbar;