← Back to team overview

zorba-coders team mailing list archive

  1. zorba-coders team
  2. Mailing list archive
  3. Message #04632

Re: [Merge] lp:zorba/3.0 into lp:zorba

  Thread Previous • Date Previous • • Thread Next 
Attempt to merge into lp:zorba failed due to conflicts: 

text conflict in src/store/naive/item.cpp
text conflict in src/store/naive/simple_pul.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/jsoniq/+merge/91966
Your team Zorba Coders is requested to review the proposed merge of lp:zorba/3.0 into lp:zorba.

References

  Thread Previous • Date Previous • • Thread Next