Skip to content

Commit

Permalink
Fix merge conflict
Browse files Browse the repository at this point in the history 
Co-authored-by: Robert Phair <rphair@cosd.com>
  • Loading branch information
@kozross @rphair
kozross and rphair committed May 5, 2024
1 parent dc157c5 commit f84b3d5
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ Below are listed tentative CIPs still under discussion with the community. They
| 0104? | [Web-Wallet Bridge - Account public key](https://github.com/cardano-foundation/CIPs/pull/588) |
| 0106? | [Web-Wallet Bridge - Mutlisig wallets](https://github.com/cardano-foundation/CIPs/pull/617) |
| 0107? | [URI Scheme - Block and transaction objects](https://github.com/cardano-foundation/CIPs/pull/635) |
| 0108? | [Governance Metadata - Governance Actions](https://github.com/cardano-foundation/CIPs/pull/632) |
| 0111? | [Web-Wallet Bridge - Wallet Transaction Caching](https://github.com/cardano-foundation/CIPs/pull/733) |
| 0112? | [Observe script type](https://github.com/cardano-foundation/CIPs/pull/749) |
| 0113? | [Programmable token-like assets](https://github.com/cardano-foundation/CIPs/pull/444) |
Expand Down

0 comments on commit f84b3d5

Please sign in to comment.