fix test env

Giveth · Jan 23, 2024 · bc5b4cc · bc5b4cc
2 parents 6f12dff + 693ef0e
commit bc5b4cc
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/config/test.env b/config/test.env
@@ -195,11 +195,8 @@ MATCHING_FUND_DONATIONS_FROM_ADDRESS=0x6e8873085530406995170Da467010565968C7C62
 # Rate Limit config
 DISABLE_SERVER_RATE_LIMITER=false
 DISABLE_SERVER_CORS=false
-<<<<<<< HEAD
-=======
-SOLANA_NODE_RPC_URL=
->>>>>>> master
 
+SOLANA_NODE_RPC_URL=
 SOLANA_MAINNET_NODE_RPC_URL=
 SOLANA_DEVNET_NODE_RPC_URL=
 SOLANA_TEST_NODE_RPC_URL=