Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@arr00
arr00 committed Nov 30, 2023
1 parent 2c321c7 commit 0f2bd87
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/party-addresses
Submodule party-addresses updated 15 files
+0 −2,700 abis/38c43e07.json
+0 −838 abis/47766eb1.json
+0 −1,268 abis/673addd1.json
+0 −820 abis/7ca9b662.json
+0 −829 abis/89909d64.json
+0 −1,122 abis/8d40fe67.json
+0 −2,279 abis/984ef4e5.json
+0 −838 abis/f283e381.json
+1 −1 contracts/base-goerli/head.json
+0 −4 contracts/base-goerli/sell_memberships/ContributionRouter.json
+2 −2 contracts/base-goerli/sell_memberships/SellPartyCardsAuthority.json
+1 −1 contracts/goerli/head.json
+0 −4 contracts/goerli/sell_memberships/ContributionRouter.json
+2 −2 contracts/goerli/sell_memberships/SellPartyCardsAuthority.json
+2 −18 deploy/sell_memberships.sol

0 comments on commit 0f2bd87

Please sign in to comment.