ocb team mailing list archive

[Holger Brunn <hbrunn@xxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear OCBers,

as you know, a script merges upstream's new revisions every night.

Since two days ago, this is stalled for ocb-addons as there are
conflicting changes.

I proposed a solution for that on
https://code.launchpad.net/~therp-nl/ocb-addons/7.0-fix_conflict_rev_9651/+merge/197171
and would like to ask you to have a look on that so that we can merge
this branch soon in order to get upstream's changes again.

Keep up your good work,
regards,
Holger

- -- 
Therp - Maatwerk in open ontwikkeling

Holger Brunn - Ontwerp en implementatie

mail: holger@xxxxxxxx
web: http://therp.nl
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iF4EAREIAAYFAlKYedwACgkQAcl2D+yjrhgN+AD+KWx/TI4XZJzVtRXcwQVRQ6ib
b00cwYMtao9JhXKJKW0BALPZdU8exW/6Ki3bGPzLuRPpg2ogPzOkEAdVWDU4D48V
=gMU0
-----END PGP SIGNATURE-----