Skip to content

Commit ad3d065

Browse files
committed
marged
2 parents 96b070d + 33eb47e commit ad3d065

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

server/src/preFlight/validateBatchConfig.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,10 @@ class ValidationError extends Error {
250250
}
251251
}
252252

253+
<<<<<<< HEAD
254+
=======
255+
//changed line 260 errors type so it would throw no errors in deliberation-lab-tools, if it breaks something then revert this change
256+
>>>>>>> config-validators
253257
export function validateBatchConfig(config: unknown) {
254258
const result = batchConfigSchema.safeParse(config);
255259
if (!result.success) {

0 commit comments

Comments
 (0)