Emulator-Archive/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2024-10-07 03:33:30 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Removed stray text from poor conflict resolution

Browse Source
This commit is contained in:
OpenSauce04 2024-06-28 23:21:37 +01:00
parent 582462808b
commit cb9def28f8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lime_qt/configuration/configure_layout.ui
View File

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