Fix rebase problem

src/lib/utils/github/GitHub.ts

@@ -1,6 +1,8 @@
 import network from '$lib/stores/wallet/network';
+import walletStore from '$lib/stores/wallet/wallet.store';
 import type { Octokit } from '@octokit/rest';
 import { Buffer } from 'buffer';
+import { get } from 'svelte/store';
 
 export type FundingJson = {
   drips?: {
@@ -44,28 +46,12 @@ export default class GitHub {
       throw new Error('FUNDING.json not found.');
     }
 
-      throw new Error(
-        `Unable to parse the FUNDING.json file. Ensure it exists, is valid JSON, and includes an address for ${network.label}.`,
-      );
-    }
-  }
+    const fundingJsonOwner =
+      fundingJson.drips?.[network.name === 'homestead' ? 'ethereum' : network.name].ownedBy;
 
-  public async verifyFundingJson(
-    owner: string,
-    repo: string,
-    expectedAddress: string,
-  ): Promise<void> {
-    const fundingJsonOwner = await this.getFundingJsonAddress(owner, repo);
-
-<<<<<<< HEAD
-    if (!fundingJsonOwner) {
-      throw new Error('Invalid FUNDING.json file. Does it exist?');
-    }
+    const { address: expectedOwner } = get(walletStore);
 
-    if (fundingJsonOwner.toLowerCase() !== expectedAddress?.toLowerCase()) {
-=======
     if (!fundingJsonOwner || fundingJsonOwner.toLowerCase() !== expectedOwner?.toLowerCase()) {
->>>>>>> e54cf005 (Establish method to fetch funding.json, struggle with typescript)
       throw new Error('Invalid FUNDING.json file. Does it have the correct Ethereum address?');
     }
   }