quantified.uncertainty/squiggle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Quinn Dougherty 2022-04-13 01:08:51 -04:00
parent de81928ea9
commit b6e423a6e3
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/squiggle-lang/src/rescript/Distributions/DistributionTypes.res
View File

@ -9,6 +9,7 @@ type error =
| NotYetImplemented | NotYetImplemented
| Unreachable | Unreachable
| DistributionVerticalShiftIsInvalid | DistributionVerticalShiftIsInvalid
| ArgumentError(string)
| Other(string) | Other(string)
module Operation = { module Operation = {

9
packages/squiggle-lang/src/rescript/Distributions/GenericDist/GenericDist_Types.res
View File

@ -1,15 +1,6 @@
type genericDist = DistributionTypes.genericDist type genericDist = DistributionTypes.genericDist
@genType @genType
<<<<<<< HEAD
type error =
| NotYetImplemented
| Unreachable
| DistributionVerticalShiftIsInvalid
| ArgumentError(string)
| Other(string)
=======
type error = DistributionTypes.error type error = DistributionTypes.error
>>>>>>> eff1810 ((rebase): (rebase): **refactor**: rm duplicated `genericDist` and `error` declarations)
@genType @genType
module Error = { module Error = {