code cleanup

adcd9f39 · Shucai Xiao · f84abdf5 · adcd9f39
Commit adcd9f39 authored Apr 17, 2019 by Shucai Xiao
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/targets/gpu/adjust_allocation.cpp src/targets/gpu/adjust_allocation.cpp +0 -4

No files found.
--- a/src/targets/gpu/adjust_allocation.cpp
+++ b/src/targets/gpu/adjust_allocation.cpp
@@ -2,10 +2,6 @@
 #include <migraphx/instruction.hpp>
 #include <migraphx/program.hpp>
 #include <migraphx/iterator_for.hpp>
-<<<<<<< HEAD
-=======
-#include <algorithm>
->>>>>>> adjust_gpu_allocation

 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {