about.html

1 changed files with 6 additions and 1 deletions
--- a/about.html
+++ b/about.html
@ -1,2 +1,7 @@
+<<<<<<< HEAD
+about what?
+
+=======
 about
 more bla bla
+>>>>>>> origin/main
Author	SHA1	Message	Date
Максим Кишкин	64fb3d5edb	about.html	2 years ago
Максим Кишкин	103f270e8a	about.html	2 years ago