From 06f6e7ed3a5446427d4053a3c6c24c1c5d3b0b09 Mon Sep 17 00:00:00 2001 From: Yashit Bamba Date: Thu, 8 Jan 2026 13:22:58 -0700 Subject: [PATCH 1/2] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0e451a62..90b47860 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # commclassroomOP Kunal Kushwaha learing github amazing.. +- This is an exmaple to make a merge conflict. From e82fd5dd24d4f79942fe7d6bd9f4fd3754d6aa07 Mon Sep 17 00:00:00 2001 From: Yashit Bamba Date: Thu, 8 Jan 2026 13:24:58 -0700 Subject: [PATCH 2/2] rahul made a changes in line 4. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 90b47860..28d8cf54 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # commclassroomOP Kunal Kushwaha learing github amazing.. -- This is an exmaple to make a merge conflict. +- This is an exmaple to make a merge conflict.