From 0657e337dacb2393d765cdf0424a3fcd3d5ddf58 Mon Sep 17 00:00:00 2001 From: Flancian <0@flancia.org> Date: Fri, 4 Mar 2022 12:38:18 +0100 Subject: [PATCH] Merge --- journal/.2022_03_03.md.swp | Bin 4096 -> 0 bytes journal/2022_03_03.md | 3 --- 2 files changed, 3 deletions(-) delete mode 100644 journal/.2022_03_03.md.swp diff --git a/journal/.2022_03_03.md.swp b/journal/.2022_03_03.md.swp deleted file mode 100644 index 8b239e17316fae316d168cc0bcbce72ecab176ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4096 zcmYc?2=nw+u+TGN00IF9hNnLjlQcNKF|00SU`WeJ%uCKp%mYc`19|zyB}MtU`S{d; zZd0brKINRXXTd`M?+vV1jq{kUIt?$Lj#ar sWhF%gVWCj+j2YE68UmvsFd71*Aut*OqaiRF0;3@?8UmvsFeF0&0A$}BdH?_b diff --git a/journal/2022_03_03.md b/journal/2022_03_03.md index 98ad2b25d..1b797b55f 100644 --- a/journal/2022_03_03.md +++ b/journal/2022_03_03.md @@ -1,4 +1,3 @@ -<<<<<<< HEAD - [[elinor ostrom]] - [[switzerland]] - [[vaud]] @@ -12,7 +11,6 @@ - [[marilyn strathern]] https://www.taylorfrancis.com/chapters/edit/10.4324/9781315673172-10/inroads-altruism-1-marilyn-strathern - "This chapter considers the idea of organs and altruism being commons-like resources, insofar as they are at once available to anyone and treated as always in short supply." - LATER [[thesis]] -======= - Yesterday I had the day off but ended up being sick :( - Had a light fever, not too much though, about 37.5. - After a good night's sleep I'm almost back to normal though (!), although tired. Perhaps this is what Covid feels like when you're fully vaccinated? Or perhaps I'm just relatively stressed and fighting back a regular cold. @@ -25,4 +23,3 @@ - graph improvements could be fun and are always visible though, hmm. I tried pitching this as a community contribution but it didn't take for now; and I think I could give [[agora wide graphs]] a shot, or add [[nth order local graphs]] and see how they look. - [[ui improvements]] in general are needed: e.g. we discussed multi-column layout (some sidebar for navigation to begin with?) a few times but I never really gave it a shot. - if you are reading this and you have an opinion on what we should improve first, please let me know :) ->>>>>>> 0af76739549f916831ee0e641e14a7d97cca2399