Commit f22336e

committed

merge conflict

2 parents 5ab4d60 + 1245b4b commit f22336eCopy full SHA for f22336e

19 files changed

+5721

-1295

lines changed

demo
- react-app-no-modal
  - package-lock.json
- vue-app-new
  - package-lock.json
  - src
    - MainView.vue
    - components
      - AppSettings.vue
    - config.ts
package-lock.json
packages
- modal/src
  - modalManager.ts
- no-modal
  - package.json
  - src
    - adapters
      - base-evm-adapter
        baseEvmAdapter.ts
      - base-solana-adapter
        baseSolanaAdapter.ts
      - default-evm-adapter
        index.ts
        injectedAdapters.ts
      - default-solana-adapter
        index.ts
        injectedAdapters.ts
      - wallet-connect-v2-adapter
        WalletConnectV2Provider.ts
        walletConnectV2adapter.ts
    - base
      - adapter
        baseAdapter.ts
      - chain
        config.ts
    - noModal.ts

19 files changed

+5721

-1295

lines changed

`‎demo/react-app-no-modal/package-lock.json‎`

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)