fix: merge conlicts update

re #1993
ecadlabs · Jan 9, 2023 · b8d80ab · b8d80ab
1 parent a673831
commit b8d80ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/integration-tests/known-contracts-ProtoALph.ts b/integration-tests/known-contracts-ProtoALph.ts
@@ -1,6 +1,6 @@
-export const knownContractProtoALph = "KT1WheWMSSsB7MCcNxHKjKgmqUYdoiqcFKQY";
-export const knownBigMapContractProtoALph = "KT1Gnuoa3nTK6gg4YF98eQngjndR1B7XH1Hq";
-export const knownTzip12BigMapOffChainContractProtoALph = "KT1Qqe8p7K9LEU5E12A5RnnyPMvpn4RyUQ2z";
-export const knownSaplingContractProtoALph = "KT1VtjTtDwyyDsAEA91vypDeuvq4Jdn2xXpP";
-export const knownOnChainViewContractAddressProtoALph = "KT1S57UG18gtobgNmiKRh6kHEcRe8VTyNmHV";
+export const knownContractProtoALph = "KT1RQfxdcqMgwNehuFShdNW86DQLy59Pgbwn";
+export const knownBigMapContractProtoALph = "KT1XEaW46fyH2VnWaoJhZtu2YxhFUvVkMv2g";
+export const knownTzip12BigMapOffChainContractProtoALph = "KT1TPjD4mdEuQvBhPNm7R9LxLnr2XLHZEEx3";
+export const knownSaplingContractProtoALph = "KT1Twv6HEgwdsaCNY6RKenctBuXm2jCahovc";
+export const knownOnChainViewContractAddressProtoALph = "KT1LKXrFKJmS2mED9q4tUL8qHjfSFwFSJ6Ls";
 export const txRollupAddressProtoALph = "";
diff --git a/package-lock.json b/package-lock.json