I ruined it

10 months ago · 9484953a77
parent 23940e3c91 5046945b83
commit 9484953a77
1 changed files with 5 additions and 2 deletions
--- a/web/index.html
+++ b/web/index.html
@ -7,8 +7,9 @@
 	<meta http-equiv="content-type" content="text/html;charset=utf-8" />
 </head>
 <body>
+
  <pre>
-<<<<<<< HEAD
+
     <><><><><>_                             
     <><><><><>| |__   __ _ _ __  _ __  _   _ 
     <><><><><>| '_ \ / _` | '_ \| '_ \| | | |<><><><><>
@ -26,7 +27,6 @@
            |_|   |_|    |___/
 _     _      _   _         _
 | |__ (_)_ __| |_| |__   __| | __ _ _   _
->>>>>>> 2a8ce601d3715627f04d4da086a8d04914d7b73a
 | '_ \| | '__| __| '_ \ / _` |/ _` | | | |
 | |_) | | |  | |_| | | | (_| | (_| | |_| |
 |_.__/|_|_|   \__|_| |_|\__,_|\__,_|\__, |
@ -39,6 +39,9 @@
 |__/                  

 </pre>
+=======
+  <pre>nothing here</pre>
+>>>>>>> 5046945b8399244e534d8aeaa6af9169bd61c5f9
 <pre>
                    _|  _|    _|      _|                      
  _|_|_|  _|    _|      _|  _|_|_|_|      _|_|_|      _|_|_|