fix merge

This commit is contained in:
Bastian committed 2020-01-15 16:39:13 +01:00
1 parent 27387ef10b
commit 13f0023a28
1 file changed
+1 -1
+1 -1
View File
@@ -29,4 +29,4 @@ undo
git checkout master <br/> git checkout master <br/>
git rebase feature <br/> git rebase feature <br/>
git checkout feature <br/> git checkout feature <br/>
git merge <br/> git merge master <br/>