chore: fix merge issues

morpho-org · Dec 15, 2024 · 0fc942a · 0fc942a
1 parent f35a2e5
commit 0fc942a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/certora/confs/LastUpdated.conf b/certora/confs/LastUpdated.conf
@@ -8,13 +8,8 @@
   "solc_map": {
     "MorphoHarness": "solc-0.8.19",
     "Util": "solc-0.8.19",
-<<<<<<< HEAD
     "MetaMorphoHarness": "solc-0.8.26",
     "ERC20Helper": "solc-0.8.26"
-=======
-    "MetaMorphoHarness": "solc-0.8.21",
-    "ERC20Helper": "solc-0.8.21"
->>>>>>> origin/main
   },
   "verify": "MetaMorphoHarness:certora/specs/LastUpdated.spec",
   "loop_iter": "2",

diff --git a/certora/confs/Liveness.conf b/certora/confs/Liveness.conf
@@ -11,13 +11,8 @@
   "solc_map": {
     "MorphoHarness": "solc-0.8.19",
     "Util": "solc-0.8.19",
-<<<<<<< HEAD
     "MetaMorphoHarness": "solc-0.8.26",
     "ERC20Helper": "solc-0.8.26"
-=======
-    "MetaMorphoHarness": "solc-0.8.21",
-    "ERC20Helper": "solc-0.8.21"
->>>>>>> origin/main
   },
   "verify": "MetaMorphoHarness:certora/specs/Liveness.spec",
   "loop_iter": "2",