From c967ed857606f62aa954592404446ca6979b668c Mon Sep 17 00:00:00 2001
From: nitheesh <ee24mt032@iitdh.ac.in>
Date: Sun, 22 Sep 2024 04:02:45 +0530
Subject: [PATCH] main lo change chesa 1.txt y means merge conflict
 telusukundham ani

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

diff --git a/1.txt b/1.txt
index f0e1659..780f901 100644
--- a/1.txt
+++ b/1.txt
@@ -6,6 +6,8 @@ void main()
 
 malli change chesa branch create chesina taruvata
 
+merge conflict yala untadho telusukundham
+
 while(1);
 
-}
\ No newline at end of file
+}