Skip to content

Commit fe4a98a

Browse files
authored
Create txt_scenario3.md
1 parent b178225 commit fe4a98a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Tasks/Conflicts/txt_scenario3.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: Changed in conflict-branch.

0 commit comments

Comments
 (0)