Merge pull request #7832 from Nir-Az/fix_merge_issue

fix merge issue
IntelRealSense · Nov 22, 2020 · d0c6ca9 · d0c6ca9
2 parents f6b392f + 0ae6e47
commit d0c6ca9
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/common/model-views.cpp b/common/model-views.cpp
@@ -1401,10 +1401,6 @@ namespace rs2
                     {
                         ui.selected_res_id = tmp_selected_res_id;
                     }
-                    else
-                    {
-                        ui.selected_res_id = tmp_selected_res_id;
-                    }
                 }
                 ImGui::PopStyleColor();
                 ImGui::PopItemWidth();