find error

jared look at here, test_cps dont work anymore commit lint remove debug code remove outdated todo add let polymorphism test save fix test save
apache · Sep 7, 2019 · 3e0746e · 3e0746e
1 parent d983094
commit 3e0746e
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/python/tvm/relay/prelude.py b/python/tvm/relay/prelude.py
@@ -262,9 +262,14 @@ def define_list_zip(self):
                                          PatternConstructor(self.cons,
                                                             [PatternVar(h2), PatternVar(t2)])]),
                            self.cons(Tuple([h1, h2]), self.zip(t1, t2)))
+<<<<<<< HEAD
         nil_case = Clause(PatternWildcard(), self.nil())
         self.mod[self.zip] = Function([l1, l2], Match(Tuple([l1, l2]), [cons_case, nil_case]),
 >>>>>>> [Relay] add Tuple pattern (#3596)
+=======
+        wildcard_case = Clause(PatternWildcard(), self.nil())
+        self.mod[self.zip] = Function([l1, l2], Match(Tuple([l1, l2]), [cons_case, wildcard_case]),
+>>>>>>> find error
                                       self.l(TupleType([a, b])), [a, b])