Skip to content

Commit

Permalink
fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Nir-Az committed Nov 22, 2020
1 parent f6b392f commit 0ae6e47
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions common/model-views.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit 0ae6e47

Please sign in to comment.