Skip to content

Commit f792c0c

Browse files
rezzcoderezzcode
committed
Add scenario file for xbuyan (version 1)
1 parent 8a4bcdf commit f792c0c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

‎Solutions/Conflict-fixes/xbuyan-txt_scenario.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Merge Me
2+
3+
This file will be used to practice resolving merge conflicts.
4+
5+
Current state: Original content.

0 commit comments

Comments
 (0)