From 1bf6c3f105fda965a93a8df93f36399259027e6b Mon Sep 17 00:00:00 2001
From: "Peter J. Holzer" <hjp@hjp.at>
Date: Sat, 22 Oct 2022 22:35:08 +0200
Subject: [PATCH] Provoke a conflict

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 26d2982..78d89b5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 1
-2
+2 yes!
 3
 33 (still all on the same line)
 4