fix merge

This commit is contained in:
Bastian 2020-01-15 16:39:13 +01:00
parent 27387ef10b
commit 13f0023a28
1 changed files with 1 additions and 1 deletions

View File

@ -29,4 +29,4 @@ undo
git checkout master <br/>
git rebase feature <br/>
git checkout feature <br/>
git merge <br/>
git merge master <br/>