resolve conflicts

Browse Source

...

This commit is contained in:

lbartoletti 2017-09-26 21:23:53 +02:00

parent e80cafb884

commit 79fb064c99

1 changed files with 9777 additions and 101 deletions

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

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

9878

tests/src/core/testqgsgeometry.cpp

File diff suppressed because one or more lines are too long