Oops, forgot to comment:
1. Need to fix merge conflict.
2. There are some code changes in here as well. I assume they are the "Removing
some warnings" comment? If so, please mention that in the commit message for
this proposal, along with the main changes.
Your team Zorba Coders is subscribed to branch lp:zorba.
Mailing list: https://launchpad.net/~zorba-coders
Post to : email@example.com
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp