From 3de0791a54bff64619919ce57550e1178bc3346b Mon Sep 17 00:00:00 2001 From: RishiManeAL Date: Fri, 9 May 2025 16:05:33 +0530 Subject: [PATCH 1/2] feat: added new file --- change.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 change.txt diff --git a/change.txt b/change.txt new file mode 100644 index 0000000..7b835dc --- /dev/null +++ b/change.txt @@ -0,0 +1 @@ +this is new change \ No newline at end of file From 063affc39bb8202cb54aedcde74cb0418cf3f3a5 Mon Sep 17 00:00:00 2001 From: RishiManeAL Date: Fri, 9 May 2025 16:19:23 +0530 Subject: [PATCH 2/2] hello --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 995bfe7..d45c360 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,5 @@ After cloning the repo, your task is to: 1. Make some changes to the code and push these changes onto the remote repository on the branch informed to you. 2. Purposely create a merge conflict in the repo and resolve it using git command line. 3. Book a one on one slot with the resource mentioned in the worksheet. + +4. hello