fix conflict

Author: aspeddro

analysis/tests/src/References.res

@@ -9,7 +9,6 @@ let c = x
 
 let foo = (~xx) => xx + 1
 //                 ^ref
-<<<<<<< HEAD
 
 module M: {
   let aa: int
@@ -21,18 +20,5 @@ let bb = M.aa
 let cc = bb
 let dd = M.aa
 //          ^ref
-let _ = <ComponentInner/>
-||||||| a61cc75
-=======
-
-module M: {
-  let aa: int
-} = {
-  let aa = 10
-}
 
-let bb = M.aa
-let cc = bb
-let dd = M.aa
-//          ^ref
->>>>>>> master
+let _ = <ComponentInner/>