Yeah, that would be my next step - I was hoping there is something easy to do to fix it that I'm missing but oh well... I'll try on infra if nobody has a solution
regards, Karl On Tue, Oct 20, 2015 at 4:29 PM, David Bosschaert < [email protected]> wrote: > I had a different problem in the past with the CMS and an email to > [email protected] sorted it out, they are usually quite quick there... > > Cheers, > > David > > On 20 October 2015 at 15:17, Karl Pauls <[email protected]> wrote: > > Yeah, me neither - I don't even understand how or why the conflict can > > happen there... :( > > > > On Tue, Oct 20, 2015 at 4:16 PM, Carsten Ziegeler <[email protected]> > > wrote: > > > >> Am 20.10.15 um 16:12 schrieb Karl Pauls: > >> > https://ci.apache.org/builders/felix-site-staging > >> > > >> Hmm, ok, I have no idea how to resolve the svn conflict (and where) :( > >> > >> Carsten > >> -- > >> Carsten Ziegeler > >> Adobe Research Switzerland > >> [email protected] > >> > > > > > > > > -- > > Karl Pauls > > [email protected] > > http://twitter.com/karlpauls > > http://www.linkedin.com/in/karlpauls > > https://profiles.google.com/karlpauls > -- Karl Pauls [email protected] http://twitter.com/karlpauls http://www.linkedin.com/in/karlpauls https://profiles.google.com/karlpauls
