I ruined it

12 months ago · 23940e3c91
parent 2da9f0b9c3 2a8ce601d3
commit 23940e3c91
1 changed files with 11 additions and 0 deletions
--- a/web/index.html
+++ b/web/index.html
@ -8,6 +8,7 @@
 </head>
 <body>
  <pre>
+<<<<<<< HEAD
     <><><><><>_                             
     <><><><><>| |__   __ _ _ __  _ __  _   _ 
     <><><><><>| '_ \ / _` | '_ \| '_ \| | | |<><><><><>
@ -16,6 +17,16 @@
     <><><><><>|_|   |_|    |___/ <><><><><>
 _     _      _   _         _             
 | |__ (_)_ __| |_| |__   __| | __ _ _   _ 
+=======
+ _                             
+| |__   __ _ _ __  _ __  _   _
+| '_ \ / _` | '_ \| '_ \| | | |
+| | | | (_| | |_) | |_) | |_| |
+|_| |_|\__,_| .__/| .__/ \__, |
+            |_|   |_|    |___/
+ _     _      _   _         _
+| |__ (_)_ __| |_| |__   __| | __ _ _   _
+>>>>>>> 2a8ce601d3715627f04d4da086a8d04914d7b73a
 | '_ \| | '__| __| '_ \ / _` |/ _` | | | |
 | |_) | | |  | |_| | | | (_| | (_| | |_| |
 |_.__/|_|_|   \__|_| |_|\__,_|\__,_|\__, |