about.html

2 years ago · 64fb3d5edb
parent 103f270e8a 1b3fbb3fc6
commit 64fb3d5edb
1 changed files with 5 additions and 0 deletions
--- a/about.html
+++ b/about.html
@ -1,2 +1,7 @@
+<<<<<<< HEAD
 about what?

+=======
+about
+more bla bla
+>>>>>>> origin/main