[weboob] Merging your branch

Romain Bignon romain at symlink.me
Fri Sep 9 10:04:06 CEST 2011


Hi Noé,


I wanted to merge your 'master' branch, but it seems there are too many
conflicts (I don't understand why, perhaps you have rebased previous commits
which are already merged in my repository).

So, could you rebase your branch on mine and fix conflicts please?

Romain
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 490 bytes
Desc: Digital signature
URL: <https://lists.symlink.me/pipermail/weboob/attachments/20110909/93a293cf/attachment.sig>


More information about the weboob mailing list