Fix merged changed.
This commit is contained in:
@@ -7,11 +7,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>520</width>
|
<width>520</width>
|
||||||
<<<<<<< Updated upstream
|
|
||||||
<height>405</height>
|
|
||||||
=======
|
|
||||||
<height>432</height>
|
<height>432</height>
|
||||||
>>>>>>> Stashed changes
|
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
|
|||||||
Reference in New Issue
Block a user