merging main

This commit is contained in:
Lucid Kobold
2022-03-26 03:06:19 -05:00
parent f2d6077f1b
commit 7ee83fc546
2 changed files with 0 additions and 8 deletions

View File

@@ -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);