Skip to content
Permalink
Browse files

resolve conflicts

  • Loading branch information
lbartoletti committed Sep 26, 2017
1 parent e80cafb commit 79fb064c99712b332e39177a0efef82a288a2483
Showing with 12,419 additions and 2,743 deletions.
  1. +12,419 −2,743 tests/src/core/testqgsgeometry.cpp

0 comments on commit 79fb064

Please sign in to comment.
You can’t perform that action at this time.