Skip to content

Commit

Permalink
manual resolve conflicts for qgisapp.ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbartoletti
lbartoletti committed Oct 18, 2017
1 parent 0d8d101 commit 64cd1c5
Showing 1 changed file with 105 additions and 139 deletions.
Loading

0 comments on commit 64cd1c5

Please sign in to comment.