Fix merge conflicts

input-output-hk · Dec 19, 2023 · 63a3c2c · 63a3c2c
1 parent 25f37a2
commit 63a3c2c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/packages/language/examples/src/atomicSwap.ts b/packages/language/examples/src/atomicSwap.ts
@@ -70,7 +70,7 @@ import {
 } from "@marlowe.io/language-core-v1";
 import * as G from "@marlowe.io/language-core-v1/guards";
 
-type IReduce = void;
+export type IReduce = void;
 const iReduce: void = undefined;
 
 /**

diff --git a/packages/language/examples/src/playground-v1/escrow.ts b/packages/language/examples/src/playground-v1/escrow.ts
@@ -63,7 +63,7 @@ import {
   Contract,
 } from "@marlowe.io/language-core-v1/playground-v1";
 
-interface EscrowParams {
+export interface EscrowParams {
   price: number;
   depositTimeout: Timeout;
   disputeTimeout: Timeout;

diff --git a/packages/language/examples/typedoc.json b/packages/language/examples/typedoc.json
@@ -4,7 +4,9 @@
     "./src/index.ts",
     "./src/vesting.ts",
     "./src/atomicSwap.ts",
-    "./src/survey.ts"
+    "./src/survey.ts",
+    "./src/playground-v1/escrow.ts",
+    "./src/playground-v1/escrow-with-collateral.ts",
   ],
   "tsconfig": "./src/tsconfig.json",
   "categorizeByGroup": false