← Back to branch summary

~zorba-coders/zorba/bug-1189804

~zorba-coders/zorba/bug-1189804

Viewing all changes in revision 11613.

Committer: Matthias Brantner
Date: 2013-09-02 20:58:31 UTC
Revision ID: matthias.brantner@28msec.com-20130902205831-kuqu3w4856rl8596

fixed invalid resolution of merge conflict

files modified:
include/zorba/pregenerated/diagnostic_list.h

modules/pregenerated/zorba-errors.xq

modules/store/unordered-maps.xq

src/diagnostics/diagnostic_en.xml

src/diagnostics/pregenerated/diagnostic_list.cpp

src/diagnostics/pregenerated/dict_en.cpp

src/runtime/store/maps_impl.cpp

Show diffs side-by-side

added added

removed removed

include/zorba/pregenerated/diagnostic_list.h

modules/pregenerated/zorba-errors.xq

modules/store/unordered-maps.xq

src/diagnostics/diagnostic_en.xml

src/diagnostics/pregenerated/diagnostic_list.cpp

src/diagnostics/pregenerated/dict_en.cpp

src/runtime/store/maps_impl.cpp

Older »