i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 01:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed code merged

Browse Source
This commit is contained in:
matlabbe
2021-06-26 13:47:49 -04:00
parent 350f995ee9
commit 1a64e05e2f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guilib/src/ui/preferencesDialog.ui
View File

@@ -95,11 +95,7 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<<<<<<< HEAD
<number>13</number> <number>13</number>
=======
<number>19</number>
>>>>>>> eabf3e3d57572b30878512e47b051986c3592cea
</property> </property>
<widget class="QWidget" name="page_22"> <widget class="QWidget" name="page_22">
<layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1"> <layout class="QVBoxLayout" name="verticalLayout_29" stretch="0,1">