From 7ee83fc5468059b38fb8e43ae3cbda09a953c09f Mon Sep 17 00:00:00 2001
From: Lucid Kobold <72232219+LucidKobold@users.noreply.github.com>
Date: Sat, 26 Mar 2022 03:06:19 -0500
Subject: [PATCH] merging main

---
 package.json            | 4 ----
 theme/layout/Header.tsx | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/package.json b/package.json
index 7cbadd8..7e808bb 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,7 @@
   "private": true,
   "name": "lucid-creations-media-potty-chart",
   "homepage": "https://lucidcreations.media/introducing-code-name-potty-chart/",
-<<<<<<< HEAD
   "version": "v0.0.8.0-alpha",
-=======
-  "version": "v0.0.7.5-alpha",
->>>>>>> main
   "author": {
     "name": "Lucid Creations Media",
     "url": "https://lucidcreations.media",
diff --git a/theme/layout/Header.tsx b/theme/layout/Header.tsx
index a42bd75..7a17399 100644
--- a/theme/layout/Header.tsx
+++ b/theme/layout/Header.tsx
@@ -15,11 +15,7 @@ import appLogo from "../../public/images/logo.svg";
 
 const Header = (): JSX.Element => {
   const appName = "LCM Potty Chart";
-<<<<<<< HEAD
   const appVersion = "v0.0.8.0-alpha";
-=======
-  const appVersion = "v0.0.7.5-alpha";
->>>>>>> main
 
   // Add transparency while not at the top of the page.
   const [transparentNavbar, setTransparentNavbar] = useState<boolean>(false);