Fix merged changed.

2014-04-27 02:05:51 -04:30
1 parent 8d175651f9
commit da91a9a5b6
@@ -7,11 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>520</width>
-<<<<<<< Updated upstream
-    <height>405</height>
-=======
    <height>432</height>
->>>>>>> Stashed changes
   </rect>
  </property>
  <property name="windowTitle">