.gitignore: fixing after merge

Change-Id: I05fee7f48860b9a7424790de11ac1acd67393444
Merge branch 'master' of git@github.com:ControlSystemStudio/cs-studio.git