fix a merge conflict

75f3d056 · Shucai Xiao · b76e438a · 75f3d056
Commit 75f3d056 authored Feb 04, 2019 by Shucai Xiao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/targets/cpu/target.cpp src/targets/cpu/target.cpp +0 -3

No files found.
--- a/src/targets/cpu/target.cpp
+++ b/src/targets/cpu/target.cpp
@@ -3,11 +3,8 @@
 #include <migraphx/cpu/lowering.hpp>
 #include <migraphx/auto_contiguous.hpp>
 #include <migraphx/rewrite_rnn.hpp>
-<<<<<<< HEAD
 #include <migraphx/rewrite_gru.hpp>
-=======
 #include <migraphx/dead_code_elimination.hpp>
->>>>>>> rnn_operator
 namespace migraphx
 {