Introduce conflicting change for xbuyan (version 2)

rezzcode · rezzcode · commit 335d09cb34a2 · 2026-03-10T14:07:24.000Z
diff --git a/Solutions/Conflict-fixes/xbuyan-txt_scenario.md b/Solutions/Conflict-fixes/xbuyan-txt_scenario.md
@@ -2,4 +2,4 @@
 
 This file will be used to practice resolving merge conflicts.
 
-Current state: Original content.
+Current state: Changed in main branch.

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`This file will be used to practice resolving merge conflicts.`
`4`	`4`
`5`		`-Current state: Original content.`
	`5`	`+Current state: Changed in main branch.`