Hi Tejas, It seems that you wrongly branched the stable 6.1 that you're proposing to merge in trunk. This involve a lot of conflicts to resolve. I'm rejecting this merge proposal, please create a new one, for trunk, if needed.
Thanks Quentin -- https://code.launchpad.net/~openerp-dev/openobject-addons/6.1-survey-tta/+merge/115953 Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/6.1-survey-tta. _______________________________________________ Mailing list: https://launchpad.net/~openerp-dev-gtk Post to : [email protected] Unsubscribe : https://launchpad.net/~openerp-dev-gtk More help : https://help.launchpad.net/ListHelp
