Introduce conflicting change for Ishmael-quant (version 3) (#35)

Ishmael-quant · web-flow · commit 9e0a7f2bf9c8 · 2026-04-03T20:38:33.000+03:00
diff --git a/Solutions/Conflict-fixes/Ishmael-quant-txt_scenario.md b/Solutions/Conflict-fixes/Ishmael-quant-txt_scenario.md
@@ -2,4 +2,5 @@
 
 This file will be used to practice resolving merge conflicts.
 
+Current state: Changed in conflict-branch.
 Current state: Changed in main branch.

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