From 6023997fccfe75ec4c64d053402c6e1e74444e37 Mon Sep 17 00:00:00 2001
From: Sourya B <sgdev.ptk@sentientgeeks.com>
Date: Wed, 2 Sep 2026 11:01:34 +0530
Subject: [PATCH] updated

---
 play/a.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/play/a.txt b/play/a.txt
index 546f196..a7c1ad0 100644
--- a/play/a.txt
+++ b/play/a.txt
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 file one
 
 file two