修改 web控件

2025-12-13 20:32:05 +08:00 · 2020-08-26 09:39:55 +08:00
parent 8952be33c4
commit fe4143a3f7
4 changed files with 347 additions and 117 deletions
--- a/widget.ui
+++ b/widget.ui
@@ -421,13 +421,6 @@
          <property name="geometry">
           <rect>
            <x>0</x>
-<<<<<<< HEAD
-            <y>-228</y>
-            <width>901</width>
-=======
-            <y>0</y>
-            <width>404</width>
->>>>>>> 7af2af64d86d0940fc60b7061485e44e2b2b4f59
            <height>849</height>
           </rect>
          </property>