merging

Dervalanana · Dec 7, 2021 · 950f9e5 · 950f9e5
2 parents 7c6947c + 17fea90
commit 950f9e5
Show file tree

Hide file tree

Showing 3 changed files with 15,286 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Getting Started with Create React App
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
@@ -68,3 +69,7 @@ This section has moved here: [https://facebook.github.io/create-react-app/docs/d
 ### `yarn build` fails to minify
 
 This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
+=======
+# HeroForgeReloaded
+a react-based D&amp;D character manager, inspired by the HeroForge character manager spreadsheet originally created in a yahoogroup some years ago
+>>>>>>> 17fea90abecb3e74f48cda30a03193ba7d195619