From 43bff0b59d7260a6cacda96b67914da37afb8149 Mon Sep 17 00:00:00 2001
From: Ayaz Hafiz <ayaz@rwx.com>
Date: Thu, 21 Apr 2022 10:16:02 -0400
Subject: [PATCH] Turn repl test back on

---
 compiler/can/src/traverse.rs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/compiler/can/src/traverse.rs b/compiler/can/src/traverse.rs
index 046b329dd4..a1f338c4ca 100644
--- a/compiler/can/src/traverse.rs
+++ b/compiler/can/src/traverse.rs
@@ -52,11 +52,7 @@ fn walk_def<V: Visitor>(visitor: &mut V, def: &Def) {
     );
     visitor.visit_expr(&loc_expr.value, loc_expr.region, *expr_var);
     if let Some(annot) = &annotation {
-<<<<<<< HEAD
         visitor.visit_annotation(annot);
-=======
-        visitor.visit_annotation(&annot);
->>>>>>> 1c2489622 (Add a way to view solved types of arbitrary expressions/patterns in a program)
     }
 }
 
@@ -121,15 +117,8 @@ fn walk_when_branch<V: Visitor>(visitor: &mut V, branch: &WhenBranch, expr_var:
     }
 }
 
-<<<<<<< HEAD
 fn walk_pattern<V: Visitor>(_visitor: &mut V, _pat: &Pattern) {
     todo!()
-=======
-fn walk_pattern<V: Visitor>(_visitor: &mut V, pat: &Pattern) {
-    match pat {
-        _ => todo!(),
-    }
->>>>>>> 1c2489622 (Add a way to view solved types of arbitrary expressions/patterns in a program)
 }
 
 trait Visitor: Sized {