diff --git a/copyright rationalization.md b/copyright rationalization.md new file mode 100644 index 000000000..b4323a8b1 --- /dev/null +++ b/copyright rationalization.md @@ -0,0 +1,6 @@ +# copyright rationalization + +- a [[project]]. + - In Flancia, [[copyright]] law + - [[pull]] [[copyright]] [[rationalism]] + diff --git a/journal/2022-01-17.md b/journal/2022-01-17.md index 1d84408d9..8553b70ec 100644 --- a/journal/2022-01-17.md +++ b/journal/2022-01-17.md @@ -10,7 +10,13 @@ - [[michael nielsen]] [[reinventing discovery]] - if there was a [[knowledge commons]] protocol, they would be supported - [[flancia]] - - the facets of the [[revolution]] + - facets of the [[revolution]] + - [[open ethics]] + - [[basic income]] + - [[copyright rationalization]] + - [[counter anti disintermediation]] + - [[commons]] + - [[knowledge commons]] - [[push]] [[matrix spaces]] - [[flancia space]] diff --git a/journal/2022-01-19.md b/journal/2022-01-19.md index f02040d7f..145c3e1c4 100644 --- a/journal/2022-01-19.md +++ b/journal/2022-01-19.md @@ -32,4 +32,8 @@ - [[push]] [[dithmarschen]] - [[maya]] told me about [[eleanor janega]] and the [[ditmarshians]] - [[on looking in the past for a better future]] -- [[tiddlywiki]] \ No newline at end of file +<<<<<<< HEAD +- [[tiddlywiki]] +======= +- [[tiddlywiki]] +>>>>>>> d8f575c3306871d3819196a56a686a20f4a41291 diff --git a/tiddlywiki.md b/tiddlywiki.md index 63c9acce0..d6238e96e 100644 --- a/tiddlywiki.md +++ b/tiddlywiki.md @@ -14,4 +14,4 @@ - [[tiddlywiki markdown]] - [[pipe alises]] == [[pipe links]] - [[foo|bar]] - + - https://twitter.com/TiddlyWiki/status/1483764445063139328