Backupppert/oh-my-git
1
0
Fork 0
mirror of https://github.com/git-learning-game/oh-my-git.git synced 2025-06-01 19:19:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Allow multiple level sets, pull out default order into "sequence" file

Browse source
This commit is contained in:
Sebastian Morr 2020-09-22 16:12:03 +02:00
parent a9f096636a
commit 5031009dd5
96 changed files with 37 additions and 29 deletions
levels/conflict
description

5
levels/conflict/description
View file

@ -1,5 +0,0 @@
(This is not a real puzzle yet.)
Try merging the two branches together!
git merge <otherbranch>