automerge

Author: dspeyer

misc/gen/autocomp.js

@@ -760,12 +760,15 @@ content = {
     "There is no one to protect you from yourself",
   ],
 
+<<<<<<< HEAD
   'There_Will_Come_Soft_Rain': [
     "There Will Come Soft Rain",
     "By Sara Teasdale (Lyrics) and Jonathon Adams (music)",
     "The world without us",
   ],
 
+=======
+>>>>>>> 2b71ff731c4be4e8ccbc0816ca0eda145d3eb65c
   'The_Singularity_Song': [
     "The Singularity Song",
     "By Heather Anne Campbell and David Barton Harris",
@@ -2286,18 +2289,18 @@ content = {
     "[speech]",
   ],
 
-  'What_is_Solstice_2024': [
-    "What is Solstice? (2024)",
-    "by Daniel Speyer",
-    "[speech]",
-  ],
-
   'What_Resembles_The_Grave_But_Isnt': [
     "What Resembles The Grave But Isn't",
     "By Anne Boyer",
     "[speech]",
   ],
 
+  'What_is_Solstice_2024': [
+    "What is Solstice? (2024)",
+    "by Daniel Speyer",
+    "[speech]",
+  ],
+
   'Whats_Left_To_Save': [
     "What's Left to Save",
     "by Maia Werbos",
@@ -2409,7 +2412,11 @@ sections = [
 ];
 
 programs = [
+<<<<<<< HEAD
  "Austin_2022",  "Austin_2023",  "Bay_2014",  "Bay_2015",  "Bay_2016",  "Bay_2018",  "Bay_2019",  "Bay_2022",  "Bay_2023",  "Bay_Outdoor_2016",  "Boston_2013",  "Boston_2015",  "Boston_2016",  "Boston_2017",  "Boston_2018",  "Boston_2019",  "Boston_2022",  "Boston_2023",  "Boston_2024",  "Childrens_Version",  "Frankfurt_2017",  "Frankfurt_2018",  "Frankfurt_2019",  "Miami_2022",  "Miami_2022_options",  "Montreal_2024",  "North_America_2020",  "NYC_2011",  "NYC_2015",  "NYC_2016",  "NYC_2017",  "NYC_2018",  "NYC_2019",  "NYC_2021",  "NYC_2022",  "NYC_2023",  "NYC_2024",  "Portland_2022",  "Seattle_2017",  "Small_DC_2020",  "Washington_DC_2015",  "Washington_DC_2019",  "Washington_DC_2021",  "Washington_DC_2022",  "Washington_DC_2023",
+=======
+ "Austin_2022",  "Austin_2023",  "Bay_2014",  "Bay_2015",  "Bay_2016",  "Bay_2018",  "Bay_2019",  "Bay_2022",  "Bay_2023",  "Bay_Outdoor_2016",  "Boston_2013",  "Boston_2015",  "Boston_2016",  "Boston_2017",  "Boston_2018",  "Boston_2019",  "Boston_2022",  "Boston_2023",  "Boston_2024",  "Childrens_Version",  "Frankfurt_2017",  "Frankfurt_2018",  "Frankfurt_2019",  "Miami_2022",  "Miami_2022_options",  "Montreal_2024",  "NYC_2011",  "NYC_2015",  "NYC_2016",  "NYC_2017",  "NYC_2018",  "NYC_2019",  "NYC_2021",  "NYC_2022",  "NYC_2023",  "NYC_2024",  "North_America_2020",  "Portland_2022",  "Seattle_2017",  "Small_DC_2020",  "Washington_DC_2015",  "Washington_DC_2019",  "Washington_DC_2021",  "Washington_DC_2022",  "Washington_DC_2023",
+>>>>>>> 2b71ff731c4be4e8ccbc0816ca0eda145d3eb65c
 ];
 
 taglines = {

songs/Find_My_Tribe/gen/thumb.png

@@ -14,27 +14,13 @@
     </div>
 <h1 id="what-is-solstice-2024">What is Solstice? (2024)</h1>
 <h2 id="by-daniel-speyer">by Daniel Speyer</h2>
-<p>Secular Solstice is a holiday designed by and for rationalists. It
-started as an attempt to match the sort of gatherings traditionally
-religious people tend to have in wintertime, but without compromising on
-truth.</p>
-<p>Is it possible to create that same sense of emotional weight without
-making stuff up to do it? And without the aid of a long tradition?
-(Though this is the 14th year we’re doing it, so there’s some
-tradition).</p>
+<p>Secular Solstice is a holiday designed by and for rationalists. It started as an attempt to match the sort of gatherings traditionally religious people tend to have in wintertime, but without compromising on truth.</p>
+<p>Is it possible to create that same sense of emotional weight without making stuff up to do it? And without the aid of a long tradition? (Though this is the 14th year we’re doing it, so there’s some tradition).</p>
 <p>Empirically, yes.</p>
-<p>Because the world is full of things that genuinely inspire awe.
-Things entirely worth honoring and celebrating.</p>
-<p>And the world is also full of things that genuinely inspire fear. We
-can and should face them squarely, and together.</p>
-<p>This is not a silly holiday. It is not Festivus. It is not Santa
-Claus and Reindeer. We gather on the longest night of the year to stare
-together straight into the deepest darkness and <em>make</em>
-<em>it</em> <em>back</em> <em>down</em>.</p>
-<p>What does it mean in practice? Lots of singing. Some speeches.
-Sometimes other things. The whole thing runs a couple of hours.</p>
-<p>[ From
-<a href="https://www.lesswrong.com/posts/nLYbjLcvedSZKFME3/secular-solstice-round-up-2024">
-Secular Solstice Round Up 2024 </a> ]</p>
+<p>Because the world is full of things that genuinely inspire awe. Things entirely worth honoring and celebrating.</p>
+<p>And the world is also full of things that genuinely inspire fear. We can and should face them squarely, and together.</p>
+<p>This is not a silly holiday. It is not Festivus. It is not Santa Claus and Reindeer. We gather on the longest night of the year to stare together straight into the deepest darkness and <em>make</em> <em>it</em> <em>back</em> <em>down</em>.</p>
+<p>What does it mean in practice? Lots of singing. Some speeches. Sometimes other things. The whole thing runs a couple of hours.</p>
+<p>[ From <a href="https://www.lesswrong.com/posts/nLYbjLcvedSZKFME3/secular-solstice-round-up-2024"> Secular Solstice Round Up 2024 </a> ]</p>
 <a href=https://github.com/SecularSolstice/SecularSolstice.github.io/edit/master/speeches/What_is_Solstice_2024.md class=editbutton>edit</a>
 </body></html>