add useful meta documentation

2021-03-14 00:47:56 +00:00 · 2021-03-14 00:47:56 +00:00 · ae99755691
parent 9a3e8cfde2 342438637f
commit ae99755691
2 changed files with 8 additions and 0 deletions
--- a/main.css
+++ b/main.css
@ -104,5 +104,10 @@ code {
    font-family: 'Comic Mono', monospace;
    font-size: 14px;
    background-color: #e4e4e4;
+<<<<<<< HEAD
+=======
+    border-radius: 4px;
+    padding: 0 4px;
+>>>>>>> 342438637f8d0d37c7b92a98868c78088d63e85e
    font-weight: 400;
 }
--- a/wiki/index.md
+++ b/wiki/index.md
@ -41,6 +41,9 @@ 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