Skip to content
Permalink
Browse files
Resolve merge conflict
  • Loading branch information
NathanW2 committed Aug 8, 2011
1 parent fc0423e commit f4c269a34a3719469426f6cf429a4d24ed732b43
Showing with 0 additions and 5 deletions.
  1. +0 −5 src/ui/qgslabelingguibase.ui
@@ -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">

0 comments on commit f4c269a

Please sign in to comment.