Removed stray text from poor conflict resolution

This commit is contained in:
OpenSauce04 2024-06-28 23:21:37 +01:00
parent 582462808b
commit cb9def28f8

View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>440</width> <width>705</width>
<height>950</height> <height>950</height>
</rect> </rect>
</property> </property>
@ -392,7 +392,6 @@
</widget> </widget>
</item> </item>
</layout> </layout>
>>>>>>> b2607fd99 (citra_qt: Remove scroll bar from Layout and Enhancements tabs):src/citra_qt/configuration/configure_layout.ui
</widget> </widget>
</item> </item>
<item> <item>