added conflicting file back

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7843 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
removed conflicting file (for 3rd time)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7844 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
added conflicting file back

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7845 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
removed conflicting file (for 3rd time)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7846 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
added conflicting file back

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7847 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
removed conflicting file (for 3rd time)

git-svn-id: svn+ssh://svn.fcdonders.nl/home/svnroot/fieldtrip/trunk@7848 0cf7c7f0-3615-4144-b4e6-68da3bce3cd0
Merge branch 'master' of github.com:fieldtrip/fieldtrip into mergeconflict