From 4f22a45cb58a40b92724c6fb29e1c1b574ea5a37 Mon Sep 17 00:00:00 2001 From: ibachar Date: Sat, 4 May 2019 15:54:02 +0300 Subject: [PATCH] Removed git merge leftovers --- examples/imgui_impl_dx11.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/imgui_impl_dx11.cpp b/examples/imgui_impl_dx11.cpp index 80ea9959..dfc32b49 100644 --- a/examples/imgui_impl_dx11.cpp +++ b/examples/imgui_impl_dx11.cpp @@ -92,7 +92,6 @@ static void ImGui_ImplDX11_SetupRenderState(ImDrawData* draw_data, ID3D11DeviceC ctx->OMSetDepthStencilState(g_pDepthStencilState, 0); ctx->RSSetState(g_pRasterizerState); } ->>>>>>> master // Render function // (this used to be set in io.RenderDrawListsFn and called by ImGui::Render(), but you can now call this directly from your main loop)