conflict

flap/src/hopix/hopixTypechecker.ml

@@ -79,6 +79,17 @@ and check_value_definition
   :  HopixTypes.typing_environment -> HopixAST.value_definition
   -> HopixTypes.typing_environment
   =
+<<<<<<< HEAD
+=======
+  fun env -> function
+  | SimpleValue (id, Some ty, ex) ->
+    failwith "Students! This is your job! (check_value_definition | SimpleValue)"
+  | RecFunctions _ ->
+    (* Je crois que c'est galère et donc c'est pas grave si on arrive pas
+       à faire les fonctions récursives *)
+    failwith "Students! This is your job! (check_value_definition | RecFunctions)"
+  | _ -> failwith "Students! This is your job!"
+>>>>>>> acd881c0dd51529a11929a7e8abb27d101b9297f
 ;;
 
 let check_definition env = function