Fixed merge conflicts

OasisDEX · Nov 6, 2024 · 2b2981e · 2b2981e
1 parent 3fbb038
commit 2b2981e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/packages/deploy-configurations/configs/tenderly.conf.ts b/packages/deploy-configurations/configs/tenderly.conf.ts
@@ -2,6 +2,8 @@ import { loadContractNames } from '@deploy-configurations/constants'
 import { SystemConfig } from '@deploy-configurations/types/deployment-config'
 import { Network } from '@deploy-configurations/types/network'
 
+import { commonDefaults } from './shared/common-defaults'
+
 const SERVICE_REGISTRY_NAMES = loadContractNames(Network.MAINNET)
 
 export const config: SystemConfig = {
@@ -415,6 +417,7 @@ export const config: SystemConfig = {
     },
   },
   common: {
+    ...commonDefaults,
     ARB: {
       name: 'ARB',
       address: '0x0000000000000000000000000000000000000000',