alex/dwroller
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Resolve merge conflict in README.md

Browse Source
This commit is contained in:
Alex Polo
2025-08-14 23:56:34 +02:00
parent 125d4e2f8b 04ddc382bb
commit 70fde8a3ee
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -1,3 +1,4 @@
<<<<<<< HEAD
# Deathwatch Roller
## Project Description
@@ -38,3 +39,7 @@ This project is licensed under the MIT License. See the LICENSE file for details
## Learn More
- [React Documentation](https://reactjs.org/)
- [Create React App Documentation](https://create-react-app.dev/)
=======
# dwroller
dwroller
>>>>>>> 18513bcff9028e31a5b4d35eba2f4deb6bf4439c