Removed artifacts like <<<< mine from TEAM errors
Authored by: hubertkluepfel 2014-04-02
Parent: [r28474]
Child: [r28476]