Resolving merge conflicts

Browse Source

...

This commit is contained in:

Thomas Krijnen

2017-12-11 14:20:30 +01:00

parent f36d27f7af

commit 988094b796

9 changed files with 2602 additions and 2578 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/ifcparse/Ifc4.cpp

+1377 -1377

File diff suppressed because one or more lines are too long