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.xml.res.moved duplicate in test/rbkt/ExpQueryResults/zorba/file/file_read_serialize.xml.res.moved duplicate in test/rbkt/Queries/zorba/collections/dynamic_node_ref1.xq.moved duplicate in test/rbkt/Queries/zorba/file/file_read_serialize.xq.moved duplicate in test/rbkt/Queries/zorba/file/mydata.xml.moved text conflict in test/rbkt/Scripts/w3c/XQTS.xml -- 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 : [email protected] Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
