From 41f19a5083fd16579875f6a2a9544734f4b70211 Mon Sep 17 00:00:00 2001
From: ION606 <ion606@protonmail.com>
Date: Sat, 18 Jan 2025 10:40:05 -0500
Subject: [PATCH] mock conflict

---
 HW01/mergeconflictfile.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/HW01/mergeconflictfile.txt b/HW01/mergeconflictfile.txt
index 14493c5..70e2001 100644
--- a/HW01/mergeconflictfile.txt
+++ b/HW01/mergeconflictfile.txt
@@ -1,2 +1,2 @@
-this is some text...yippie
-bottom text
+oh no!
+I changed a file!