Ah ah, the merge conflict added some chaos to the blog

juin-en-anglais · Dec 22, 2022 · 4d1157b · 4d1157b
1 parent 27d1a8b
commit 4d1157b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/index.html b/index.html
@@ -3,6 +3,12 @@
  <meta charset="utf-8">
 </head>
 <body><pre>
+* commit 27d1a8b
+| Author: June &lt;[email protected]&gt;
+| Date:   Thu Dec 22 04:09:36 2022 +0100
+| 
+|     Add a demo!
+|   
 *   commit c5b3f89
 |\  Merge: b0c6f33 e68da76
 | | Author: June &lt;[email protected]&gt;