From 37b47dac65c89446906bbdd8aacf3dcdd1cfa4d8 Mon Sep 17 00:00:00 2001
From: cpulidoc <109989453+cpulidoc@users.noreply.github.com>
Date: Thu, 9 Jan 2025 16:19:36 -0500
Subject: [PATCH] edit file

---
 test-merge-conflict.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test-merge-conflict.md b/test-merge-conflict.md
index 64f4173..5268cc1 100644
--- a/test-merge-conflict.md
+++ b/test-merge-conflict.md
@@ -40,6 +40,6 @@ This is a sample file created to practice resolving merge conflicts.
 10. Go through steps mentioned above to resolve the merge conflict.
 
 ## Sample Content
-Hello, today is <DATE>.
-This is line 2, by <USERNAME>.
-I live in <CITY>, <COUNTRY>.
+Hello, today is Jan 9.
+This is line 2, by Cristhian Pulido.
+I live in Bogotown, Colombia.