changed gitattributes back
removed .gitattributes from repository
Merge branch 'osx' into error_panel

* osx:
  removed .gitattributes from repository
  changed gitattributes back