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

This commit is contained in:
June Hardy 2022-12-22 04:16:10 +01:00
parent 27d1a8b8f8
commit 4d1157b9aa
1 changed files with 6 additions and 0 deletions

View File

@ -3,6 +3,12 @@
<meta charset="utf-8">
</head>
<body><pre>
* commit 27d1a8b
| Author: June &lt;june@lacoloc.cafe&gt;
| Date: Thu Dec 22 04:09:36 2022 +0100
|
| Add a demo!
|
* commit c5b3f89
|\ Merge: b0c6f33 e68da76
| | Author: June &lt;june@lacoloc.cafe&gt;