Skip to content

Commit 9e4f8be

Browse files
rezzcoderezzcode
committed
Add scenario file for the1Riddle (version 1)
1 parent 31dbed0 commit 9e4f8be

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

‎Solutions/Conflict-fixes/the1Riddle-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)