← Back to team overview

zorba-coders team mailing list archive

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

Re: [Merge] lp:~zorba-coders/zorba/bug-1067028-no-json into lp:zorba

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

text conflict in src/compiler/rewriter/rules/type_rules.cpp
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1067028-no-json/+merge/129743
Your team Zorba Coders is subscribed to branch lp:zorba.

References

  Thread Previous • Date Previous • • Thread Next