浏览代码

Delete merging artefact that survived for a day

ocornut 10 年之前
父节点
当前提交
e681937f66
共有 1 个文件被更改,包括 0 次插入1 次删除
  1. 0 1
      imgui.cpp

+ 0 - 1
imgui.cpp

@@ -138,7 +138,6 @@
  Occasionally introducing changes that are breaking the API. The breakage are generally minor and easy to fix.
  Here is a change-log of API breaking changes, if you are using one of the functions listed, expect to have to fix some code.
  
-<<<<<<< HEAD
  - 2015/07/08 (1.43) - switched rendering data to use indexed rendering. this is saving a fair amount of CPU/GPU and enables us to get anti-aliasing for a marginal cost.
                        this necessary change will break your rendering function! the fix should be very easy. sorry for that :(
                      - if you are using a vanilla copy of one of the imgui_impl_XXXX.cpp provided in the example, you just need to update your copy and you can ignore the rest.