Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Resolve merge conflict
  • Loading branch information
NathanW2 committed Aug 8, 2011
1 parent fc0423e commit f4c269a
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/ui/qgslabelingguibase.ui
Expand Up @@ -445,13 +445,8 @@
<rect>
<x>0</x>
<y>0</y>
<<<<<<< HEAD
<width>645</width>
<height>488</height>
=======
<width>643</width>
<height>478</height>
>>>>>>> upstream/master
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_13">
Expand Down

0 comments on commit f4c269a

Please sign in to comment.