← Back to team overview

zorba-coders team mailing list archive

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

Re: [Merge] lp:~zorba-coders/zorba/bug-1015468 into lp:zorba

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

text conflict in src/unit_tests/test_uri.cpp
text conflict in src/zorbatypes/URI.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1015468/+merge/161712
Your team Zorba Coders is subscribed to branch lp:zorba.

References

  Thread Previous • Date Previous • • Thread Next