remove paras
commit hunk
Merge branch 'feature'
Merge branch 'master' of https://github.com/fotogarten/Projekt
yes
Merge branch 'master' of https://github.com/fotogarten/Projekt into feature/feature_2