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

@@ -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",