resolved merge conflict between B and A branches

shahealam.it · shahealam.it · commit e22bcdad0fd3 · 2025-12-09T21:38:10.000+05:30
diff --git a/hello.txt b/hello.txt
@@ -1,4 +1,6 @@
 hello devops
 This is my second line.
 This is from feature-1 branch.
-This line is edited by conflict-B branch
+This line is edited by conflict-B branch
+This line is added from GitHub feature-2 branch
+This line is edited by conflict-A branch
