Re: [Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0

2011-09-23 Thread Zorba Build Bot
Attempt to merge into lp:~zorba-coders/zorba/2.0 failed due to conflicts: text conflict in ChangeLog text conflict in NOTICE.txt duplicate in doc/zorba/ft_tokenizer.dox.moved duplicate in doc/zorba/indexpage.dox.in.moved duplicate in test/rbkt/ExpQueryResults/zorba/collections/dynamic_node_ref1.

Re: [Zorba-coders] [Merge] lp:~ceejatec/zorba/dummy-2.0-change into lp:~zorba-coders/zorba/2.0

2011-09-23 Thread Chris Hillery
Review: Approve Just testing -- https://code.launchpad.net/~ceejatec/zorba/dummy-2.0-change/+merge/76685 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/2.0. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : h