fix(lint): missed conflict

snapshot-labs · Aug 25, 2023 · 113a500 · 113a500
1 parent 89d5292
commit 113a500
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/check.ts b/src/check.ts
@@ -60,15 +60,8 @@ async function processSig(address, safeHash, network) {
 
 async function checkSignedMessages(messages, network) {
   if (messages.length > 0) {
-<<<<<<< Updated upstream
     const end = timeMessageProcess.startTimer({ network });
-    const provider = snapshot.utils.getProvider(network);
-=======
-    const provider = snapshot.utils.getProvider(
-      network,
-      { broviderUrl: process.env.BROVIDER_URL }
-    );
->>>>>>> Stashed changes
+    const provider = snapshot.utils.getProvider(network, { broviderUrl: process.env.BROVIDER_URL });
     const abi = ['function signedMessages(bytes32) view returns (uint256)'];
     try {
       const response = await snapshot.utils.multicall(