From bfb4455a55098e00cde5f6eb33a633c914751975 Mon Sep 17 00:00:00 2001
From: Piotr Kaminski <piotr@reviewable.io>
Date: Thu, 11 Sep 2025 21:08:54 -0800
Subject: [PATCH 1/2] Update lorem.txt

---
 lorem.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lorem.txt b/lorem.txt
index dafb847..51c7af0 100644
--- a/lorem.txt
+++ b/lorem.txt
@@ -19,8 +19,12 @@ A different line in base.
 // molestie hendrerit lorem vitae dapibus. In convallis maximus mauris, sit amet hendrerit lectus
 // vulputate ac.
 
+<<<<<<< HEAD
 Another new line.  Conflict time earlier!
 Why isn't this a conflict?
+=======
+Another new line.  Conflict time right now!
+>>>>>>> 5a2f6e2 (Update lorem.txt)
 
 // Aliquam mollis rhoncus diam, nec varius orci tristique in. In accumsan ac lacus sit amet tempor.
 // Etiam iaculis nec libero ac lacinia. Donec finibus, nunc vitae dapibus iaculis, turpis tortor

From a7183101d4bd6ab667e11949d6f2bbb76db0d235 Mon Sep 17 00:00:00 2001
From: Piotr Kaminski <piotr@reviewable.io>
Date: Wed, 29 Apr 2026 15:36:27 -0800
Subject: [PATCH 2/2] Fix typo in comment in lorem.txt

Correct a typo in the comment within lorem.txt.
---
 lorem.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lorem.txt b/lorem.txt
index 51c7af0..40ce372 100644
--- a/lorem.txt
+++ b/lorem.txt
@@ -34,7 +34,7 @@ Another new line.  Conflict time right now!
 // condimentum purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur
 // ridiculus mus. Praesent vitae augue et sapien egestas ultrices. Vestibulum ac posuere lectus,
 // vitae semper dui. Integer fermentum nec nulla eget aliquet. Fusce vitae tortor hendrerit, maximus
-// ipsum id, fringilla mi.
+// ipsum id, fringilla miiii.
 
 Something something blah blah blah.  And more blahssss.