account-payment-team team mailing list archive
-
account-payment-team team
-
Mailing list archive
-
Message #00122
Re: [Merge] lp:~avanzosc/account-payment/6.1 into lp:account-payment
Review: Approve
Thanks. It was actually quite hard to see what you changed in your last commit, as you did a merge with upstream as well (as far as I could tell). You should probably not mix merges and manual commits unless there is a conflict that needs solving. Speaking of which, there is a trivial conflict in one of the translation files but this can be handled at merge time.
--
https://code.launchpad.net/~avanzosc/account-payment/6.1/+merge/147613
Your team Account Payment is subscribed to branch lp:account-payment.
References