fix conflict

AztecProtocol · Nov 15, 2024 · c5152e9 · c5152e9
1 parent c7b693b
commit c5152e9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/yarn-project/end-to-end/src/spartan/proving.test.ts b/yarn-project/end-to-end/src/spartan/proving.test.ts
@@ -4,7 +4,7 @@ import { createDebugLogger } from '@aztec/foundation/log';
 import { jest } from '@jest/globals';
 import { type ChildProcess } from 'child_process';
 
-import { getConfig, isK8sConfig, startPortForward } from './k8_utils.js';
+import { getConfig, isK8sConfig, startPortForward } from './utils.js';
 
 jest.setTimeout(2_400_000); // 40 minutes