removed xml
This commit is contained in:
parent
3eedf55bca
commit
63ba502246
|
@ -46,7 +46,7 @@ jobs:
|
|||
ls
|
||||
git log -5
|
||||
git status
|
||||
git rebase origin/master --strategy-option=theirs
|
||||
git rebase -Xtheirs origin/master
|
||||
ls
|
||||
git log -4
|
||||
git status
|
||||
|
|
Loading…
Reference in New Issue