Update README.md

burnt-exe · Aug 13, 2024 · f91925a · f91925a
1 parent 10cd3f0
commit f91925a
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Smile and Cry App
 
 ![React Badge](https://img.shields.io/badge/React-17.0.2-blue.svg)
@@ -86,6 +85,4 @@ Raydo Matthee, known in the digital world as @burnt-exe, leads Skunkworks with a
 
 We invite you to explore the repository and learn more about the transformative work we're doing at Skunkworks.
 
-_© 2024 Raydo Matthee. All Rights Reserved._
->>>>>>> origin/main
->>>>>>> a612cff5757667de2dff971dadf75f13e535cac4
+_© 2024 Raydo Matthee. All Rights Reserved._