From 9c5f7d5d62d25e1be8cb95bb69ed876efce900b3 Mon Sep 17 00:00:00 2001 From: Richa Date: Sun, 14 Sep 2025 15:16:09 +0530 Subject: [PATCH] f2 changes in conflict.txt --- conflict.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conflict.txt b/conflict.txt index e97bf0c..6dc1032 100644 --- a/conflict.txt +++ b/conflict.txt @@ -1,3 +1,4 @@ This is line 1 -This is line 2 +This is line 2 — edited in f2 + This is line 3