remove merge conflict marker from .gitignore
remove merge conflict marker from .gitignore
Piratenfraktion-Berlin/OwnTube,Piratenfraktion-Berlin/OwnTube,Piratenfraktion-Berlin/OwnTube,LambdaCast/LambdaCast,LambdaCast/LambdaCast,LambdaCast/LambdaCast