Skip to content

Commit 07c4fcf

Browse files
committed
test(cli): fix merge conflicts in sandboxConfig.test.ts
Resolves the merge conflicts introduced in sandboxConfig.test.ts when cherry-picking #24055 (Enable network access in sandbox configuration).
1 parent 38431fd commit 07c4fcf

1 file changed

Lines changed: 0 additions & 12 deletions

File tree

packages/cli/src/config/sandboxConfig.test.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,8 @@ describe('loadSandboxConfig', () => {
338338
sandbox: {
339339
enabled: true,
340340
command: 'podman',
341-
<<<<<<< HEAD
342-
=======
343341
allowedPaths: [],
344342
networkAccess: true,
345-
>>>>>>> 765fb6701 (Enable network access in sandbox configuration (#24055))
346343
},
347344
},
348345
},
@@ -358,11 +355,8 @@ describe('loadSandboxConfig', () => {
358355
sandbox: {
359356
enabled: true,
360357
image: 'custom/image',
361-
<<<<<<< HEAD
362-
=======
363358
allowedPaths: [],
364359
networkAccess: true,
365-
>>>>>>> 765fb6701 (Enable network access in sandbox configuration (#24055))
366360
},
367361
},
368362
},
@@ -377,11 +371,8 @@ describe('loadSandboxConfig', () => {
377371
tools: {
378372
sandbox: {
379373
enabled: false,
380-
<<<<<<< HEAD
381-
=======
382374
allowedPaths: [],
383375
networkAccess: true,
384-
>>>>>>> 765fb6701 (Enable network access in sandbox configuration (#24055))
385376
},
386377
},
387378
},
@@ -397,10 +388,7 @@ describe('loadSandboxConfig', () => {
397388
sandbox: {
398389
enabled: true,
399390
allowedPaths: ['/settings-path'],
400-
<<<<<<< HEAD
401-
=======
402391
networkAccess: true,
403-
>>>>>>> 765fb6701 (Enable network access in sandbox configuration (#24055))
404392
},
405393
},
406394
},

0 commit comments

Comments
 (0)