fix: merge conflict

Author: willpan1102

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/workflows/powervoting-contracts.yml

@@ -12,29 +12,4 @@ on:
 env:
   FOUNDRY_PROFILE: ci
 
-jobs:
-  check-powervoting-contracts:
-    name: foundry project
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Run Forge build
-        run: |
-          cd ./powervoting-contracts
-          forge --version
-          forge build --sizes
-        id: build
-
-      - name: Run Forge tests
-        run: |
-          cd ./powervoting-contracts
-          forge test -vvv
-        id: test

.github/workflows/test-frontend.yml

@@ -37,17 +37,4 @@ jobs:
       - name: Test
         run: |
           cd power-voting
-          npm run test
-
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy on server
-        uses: appleboy/ssh-action@v0.1.8
-        with:
-          host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USERNAME }}
-          key: ${{ secrets.SSH_KEY }}
-          script: |
-            cd ${{ vars.BUILD_PATH }}
-            sh frontend.sh
+          npm run test

.gitmodules

@@ -13,16 +13,3 @@
 [submodule "power-oracle-contracts/lib/filecoin-solidity"]
 	path = power-oracle-contracts/lib/filecoin-solidity
 	url = https://github.com/filecoin-project/filecoin-solidity
-
-[submodule "powervoting-contracts/lib/openzeppelin-contracts"]
-	path = powervoting-contracts/lib/openzeppelin-contracts
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts
-[submodule "powervoting-contracts/lib/openzeppelin-contracts-upgradeable"]
-	path = powervoting-contracts/lib/openzeppelin-contracts-upgradeable
-	url = https://github.com/OpenZeppelin/openzeppelin-contracts-upgradeable
-[submodule "powervoting-contracts/lib/solidity-cborutils"]
-	path = powervoting-contracts/lib/solidity-cborutils
-	url = https://github.com/smartcontractkit/solidity-cborutils
-[submodule "powervoting-contracts/lib/forge-std"]
-	path = powervoting-contracts/lib/forge-std
-	url = https://github.com/foundry-rs/forge-std

FUNDING.json

@@ -0,0 +1,7 @@
+{
+  "drips": {
+    "filecoin": {
+      "ownedBy": "0x8D6DCAb2047580d46E0187F6D698C37Da395749b"
+    }
+  }
+}