Merge pull request #2761 from bsansouci/tiny-fix

Tiny typo fix in error message

Author: bobzhang

vendor/ocaml/parsing/lexer.ml

@@ -706,7 +706,7 @@ let report_error ppf = function
   | Unterminated_paren_in_conditional ->
     fprintf ppf "Unterminated parens in conditional predicate"
   | Expect_hash_then_in_conditional -> 
-      fprintf ppf "Expect `then` after conditioal predicate"
+      fprintf ppf "Expect `then` after conditional predicate"
   | Conditional_expr_expected_type (a,b) -> 
       fprintf ppf "Conditional expression type mismatch (%s,%s)" 
         (string_of_type_directive a )

vendor/ocaml/parsing/lexer.mll

@@ -719,7 +719,7 @@ let report_error ppf = function
   | Unterminated_paren_in_conditional ->
     fprintf ppf "Unterminated parens in conditional predicate"
   | Expect_hash_then_in_conditional -> 
-      fprintf ppf "Expect `then` after conditioal predicate"
+      fprintf ppf "Expect `then` after conditional predicate"
   | Conditional_expr_expected_type (a,b) -> 
       fprintf ppf "Conditional expression type mismatch (%s,%s)" 
         (string_of_type_directive a )