Am 17.10.2016 um 20:40 schrieb ple...@apache.org: > Repository: incubator-tamaya-extensions > Updated Branches: > refs/heads/master 669277da6 -> 4900aa7fa
I'm unable to checkout master due to the fact that it generates a merge conflict .... does anyone have the same? events/pom.xml is conflicting Cheers Phil