← Back to team overview

zorba-coders team mailing list archive

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

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

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

text conflict in src/compiler/translator/translator.cpp
text conflict in test/fots/CMakeLists.txt
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/160839
Your team Zorba Coders is subscribed to branch lp:zorba.

References

  Thread Previous • Date Previous • • Thread Next