From a2443da337b5a5e6a7cf8e57e7c2880d7c56efeb Mon Sep 17 00:00:00 2001
From: Aastha <aastha0243.becse24@chitkara.edu.in>
Date: Wed, 26 Mar 2025 18:27:13 +0530
Subject: [PATCH] Updated README.md in conflict-demo branch

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cde51868c..2f00212ea 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
 # GoogleTest
+This is an update from conflict-demo branch.