Skip to content

Commit f4c269a

Browse files
committed
Resolve merge conflict
1 parent fc0423e commit f4c269a

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/ui/qgslabelingguibase.ui

-5
Original file line numberDiff line numberDiff line change
@@ -445,13 +445,8 @@
445445
<rect>
446446
<x>0</x>
447447
<y>0</y>
448-
<<<<<<< HEAD
449-
<width>645</width>
450-
<height>488</height>
451-
=======
452448
<width>643</width>
453449
<height>478</height>
454-
>>>>>>> upstream/master
455450
</rect>
456451
</property>
457452
<layout class="QGridLayout" name="gridLayout_13">

0 commit comments

Comments
 (0)