update

apache · Aug 12, 2019 · 481c4fa · 481c4fa
1 parent c685007
commit 481c4fa
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/relay/pass/quantize/quantize.h b/src/relay/pass/quantize/quantize.h
@@ -29,10 +29,7 @@
 #include <tvm/relay/op.h>
 #include <tvm/relay/expr.h>
 #include <string>
-<<<<<<< HEAD:src/relay/pass/quantize/quantize.h
 #include "../pattern_util.h"
-=======
->>>>>>> 68f94f5... Refactor code base.:src/relay/pass/quantize/quantize.h
 
 namespace tvm {
 namespace relay {