ow'd that get there init?

2021-03-14 01:44:52 +00:00 · 2021-03-14 01:44:52 +00:00 · 02f9c961db
parent aabb4e03e0
commit 02f9c961db
1 changed files with 0 additions and 3 deletions
--- a/wiki/index.md
+++ b/wiki/index.md
@ -41,9 +41,6 @@ hi! welcome to the wiki. it contains some helpful info about living life on sout
 ## helping out
 - [how to contribute to this wiki](./contribute.html)
 - [how to give us money](./donate.html)
-<<<<<<< HEAD
 <style>
 main {max-width: 500px;}
 </style>
-=======
->>>>>>> 342438637f8d0d37c7b92a98868c78088d63e85e