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

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

diff --git a/HW01/mergeconflictfile.txt b/HW01/mergeconflictfile.txt
index 14493c5..f468033 100644
--- a/HW01/mergeconflictfile.txt
+++ b/HW01/mergeconflictfile.txt
@@ -1,2 +1 @@
-this is some text...yippie
-bottom text
+changing on a branch...dooodododooo
\ No newline at end of file