update

ZihengJiang · ZihengJiang · commit 481c4fabacda · 2019-08-12T14:40:49.000-07:00
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 {
