fixed bug after rebase: hope it doesn't cause problems

2022-04-13 01:08:51 -04:00 · 2022-04-13 01:08:51 -04:00 · b6e423a6e3
commit b6e423a6e3
parent de81928ea9
2 changed files with 1 additions and 9 deletions
--- a/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res
@ -9,6 +9,7 @@ type error =
  | NotYetImplemented
  | Unreachable
  | DistributionVerticalShiftIsInvalid
+  | ArgumentError(string)
  | Other(string)

 module Operation = {
--- a/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
+++ b/packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
@ -1,15 +1,6 @@
 type genericDist = DistributionTypes.genericDist
@genType
-<<<<<<< HEAD
-type error =
-  | NotYetImplemented
-  | Unreachable
-  | DistributionVerticalShiftIsInvalid
-  | ArgumentError(string)
-  | Other(string)
-=======
 type error = DistributionTypes.error
->>>>>>> eff1810 ((rebase): (rebase): **refactor**: rm duplicated `genericDist` and `error` declarations)

@genType
 module Error = {