fix conflict
This commit is contained in:
commit
4d21e5b60c
|
|
@ -200,7 +200,7 @@ Whilst these users may not solely discuss crypto or web3, they do discuss it reg
|
|||
|
||||
#### Buddhist
|
||||
|
||||
* [Sujato Bhikkhu on Crypto](https://www.youtube.com/watch?v=CA_cfLqIkA0) by Sujato Bhikkhu - 2021-12-15 - A monk explains why crypto is incompatible with the teachings of the Buddha from both moral and spiritual dimensions.
|
||||
* [Sujato Bhikkhu on Crypto](https://www.youtube.com/watch?v=CA_cfLqIkA0) by Sujato Bhikkhu. A monk explains why crypto is incompatible with the teachings of the Buddha from both moral and spiritual dimensions.
|
||||
|
||||
#### Christian
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,44 @@
|
|||
# Introduction
|
||||
|
||||
[[web3]] is a huge phenomenon but it can be hard to make sense of. We’re launching this collaborative initiative to address this. This page serves as a spine for all concepts related to the topic.
|
||||
|
||||
## Economics
|
||||
|
||||
* [[artificial-scarcity]]
|
||||
* [[asymmetric-information]]
|
||||
* [[central-banks]]
|
||||
* [[currency]]
|
||||
* [[currency-peg]]
|
||||
* [[free-rider-problem]]
|
||||
* [[gold-standard]]
|
||||
* [[market-manipulation]]
|
||||
* [[moral-hazard]]
|
||||
* [[public-goods-problem]]
|
||||
* [[zero-sum-game]]
|
||||
|
||||
## Technology
|
||||
|
||||
* [[blockchain]]
|
||||
* [[cryptoasset]]
|
||||
* [[dao]]
|
||||
* [[defi]]
|
||||
* [[decentralization]]
|
||||
* [[ico]]
|
||||
* [[nft]]
|
||||
* [[ransomware]]
|
||||
* [[smart-contracts]]
|
||||
* [[stablecoin]]
|
||||
|
||||
## Regulation
|
||||
|
||||
* [[aml]]
|
||||
* [[kyc]]
|
||||
|
||||
## Ideologies
|
||||
|
||||
* [[market-fundamentalism]]
|
||||
* [[austrian-economics]]
|
||||
* [[libertarianism]]
|
||||
* [[technosolutionism]]
|
||||
* [[keynsian-economics]]
|
||||
|
||||
Loading…
Reference in New Issue