testing
Merge branch 'master' of https://github.com/rodo1111/git-training-onstar
adding to a new branch
Merge branch 'master' of https://github.com/rodo1111/git-training-onstar into diego20ha
Ola ke ase
Merge branch 'diego20ha' of https://github.com/rodo1111/git-training-onstar into diego20ha
Merge branch 'master' of https://github.com/rodo1111/git-training-onstar into diestrin
Merge branch 'diego20ha' into diestrin
Gen erating conflict
Modify index file
resolving conflict