1 changed files with 1 additions and 6 deletions
--- a/about.html
+++ b/about.html
@ -1,7 +1,2 @@
-<<<<<<< HEAD
-about what?
-
-=======
 about
-more bla bla
->>>>>>> origin/main
+more bla bla