Automated commit

1 files changed, 8 insertions, 42 deletions

diff --git a/2023/schedule-details.md b/2023/schedule-details.md
index b61a07b2..0eb16676 100644
--- a/2023/schedule-details.md
+++ b/2023/schedule-details.md
@@ -1,37 +1,10 @@
-The conference is from ~9:00 AM - 5:00 PM EST (US/Eastern) / ~8:00 AM - 4:00 PM CST (US/Central) / ~7:00 AM - 3:00 PM MST (US/Mountain) / ~6:00 AM - 2:00 PM PST (US/Pacific) / ~2:00 PM - 10:00 PM UTC  / ~3:00 PM - 11:00 PM CET (Europe/Paris) / ~4:00 PM - 12:00 AM EET (Europe/Athens) / ~7:30 PM - 3:30 AM IST (Asia/Kolkata) / ~10:00 PM - 6:00 AM +08 (Asia/Singapore) / ~11:00 PM - 7:00 AM JST (Asia/Tokyo).
-
-Times below are in US/Eastern (GMT-0500). If you have Javascript enabled, clicking on talk pages should include times in your computer's local time setting.
-
-You can also get this schedule as iCalendar files: <a href="https://media.emacsconf.org/2023/emacsconf.ics">emacsconf.ics</a> - <a href="https://media.emacsconf.org/2023/emacsconf-gen.ics">emacsconf-gen.ics</a> - <a href="https://media.emacsconf.org/2023/emacsconf-dev.ics">emacsconf-dev.ics</a>. Importing that into your calendar should translate things into your local timezone. Alternatively, you can use these timezone-translated Org files: <https://media.emacsconf.org/2023/schedules/>
-
 Jump to: <a href="#date-2023-12-02">Sat Dec 2</a> - <a href="#date-2023-12-03">Sun Dec 3</a><a name="date-2023-12-02"></a>
 # Saturday Dec 2, 2023
 [[!inline pages="internal(2023/schedule-2023-12-02)" raw="yes"]]
 
 <div class="schedule" data-start="2023-12-02T14:00:00+0000" data-end="2023-12-02T22:30:00+0000" data-tracks="General,Development">
-<<<<<<< HEAD
-[[!template id=sched time="""10""" q-and-a="""""" startutc="""2023-12-02T14:00:00+0000""" endutc="""2023-12-02T14:10:00+0000""" start="""9:00""" end="""9:10""" title="""Saturday opening remarks""" url="""/2023/talks/sat-open""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""sat-open""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""none""" startutc="""2023-12-02T14:10:00+0000""" endutc="""2023-12-02T14:20:00+0000""" start="""9:10""" end="""9:20""" title="""An Org-Mode based text adventure game for learning the basics of Emacs, inside Emacs, written in Emacs Lisp""" url="""/2023/talks/adventure""" speakers="""Chung-hong Chan""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""adventure""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-uni.html">BBB</a>""" startutc="""2023-12-02T14:30:00+0000""" endutc="""2023-12-02T14:50:00+0000""" start="""9:30""" end="""9:50""" title="""Authoring and presenting university courses with Emacs and a full libre software stack""" url="""/2023/talks/uni""" speakers="""James Howell""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""uni""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://pad.emacsconf.org/2023-matplotllm">Etherpad</a>""" startutc="""2023-12-02T15:00:00+0000""" endutc="""2023-12-02T15:10:00+0000""" start="""10:00""" end="""10:10""" title="""MatplotLLM, iterative natural language data visualization in org-babel""" url="""/2023/talks/matplotllm""" speakers="""Abhinav Tushar""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""matplotllm""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-teaching.html">BBB</a>""" startutc="""2023-12-02T15:05:00+0000""" endutc="""2023-12-02T15:25:00+0000""" start="""10:05""" end="""10:25""" title="""Teaching computer and data science with literate programming tools""" url="""/2023/talks/teaching""" speakers="""Marcus Birkenkrahe""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""teaching""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-voice.html">BBB</a>""" startutc="""2023-12-02T15:20:00+0000""" endutc="""2023-12-02T15:40:00+0000""" start="""10:20""" end="""10:40""" title="""Improving access to AI-assisted literate programming with voice control""" url="""/2023/talks/voice""" speakers="""Blaine Mooers""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""voice""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-table.html">BBB</a>""" startutc="""2023-12-02T15:40:00+0000""" endutc="""2023-12-02T15:50:00+0000""" start="""10:40""" end="""10:50""" title="""Who needs Excel? Managing your students qualifications with org-table""" url="""/2023/talks/table""" speakers="""Daniel Molina""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""table""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-llm.html">BBB</a>""" startutc="""2023-12-02T15:55:00+0000""" endutc="""2023-12-02T16:15:00+0000""" start="""10:55""" end="""11:15""" title="""LLM clients in Emacs, functionality and standardization""" url="""/2023/talks/llm""" speakers="""Andrew Hyatt""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""llm""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-taming.html">BBB</a>""" startutc="""2023-12-02T16:05:00+0000""" endutc="""2023-12-02T16:15:00+0000""" start="""11:05""" end="""11:15""" title="""Taming things with Org Mode""" url="""/2023/talks/taming""" speakers="""Gergely Nagy (algernon)""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""taming""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-one.html">BBB</a>""" startutc="""2023-12-02T16:30:00+0000""" endutc="""2023-12-02T16:50:00+0000""" start="""11:30""" end="""11:50""" title="""one.el: the static site generator for Emacs Lisp Programmers""" url="""/2023/talks/one""" speakers="""Tony Aldon""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""one""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-writing.html">BBB</a>""" startutc="""2023-12-02T18:00:00+0000""" endutc="""2023-12-02T18:10:00+0000""" start="""1:00""" end="""1:10""" title="""Emacs turbo-charges my writing""" url="""/2023/talks/writing""" speakers="""Jeremy Friesen""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""writing""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-overlay.html">BBB</a>""" startutc="""2023-12-02T18:00:00+0000""" endutc="""2023-12-02T18:20:00+0000""" start="""1:00""" end="""1:20""" title="""Improving compiler diagnostics with Overlays""" url="""/2023/talks/overlay""" speakers="""Jeff Trull""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""overlay""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-nabokov.html">BBB</a>""" startutc="""2023-12-02T18:25:00+0000""" endutc="""2023-12-02T18:35:00+0000""" start="""1:25""" end="""1:35""" title="""Why Nabokov would use Org-Mode if he were writing today""" url="""/2023/talks/nabokov""" speakers="""Edmund Jorgensen""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""nabokov""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-eval.html">BBB</a>""" startutc="""2023-12-02T18:35:00+0000""" endutc="""2023-12-02T18:45:00+0000""" start="""1:35""" end="""1:45""" title="""Editor Integrated REPL Driven Development for all languages""" url="""/2023/talks/eval""" speakers="""Musa Al-hassy""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""eval""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""none""" startutc="""2023-12-02T18:50:00+0000""" endutc="""2023-12-02T19:10:00+0000""" start="""1:50""" end="""2:10""" title="""Collaborative data processing and documenting using org-babel""" url="""/2023/talks/collab""" speakers="""Jonathan Hartman, Lukas C. Bossert""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""collab""" note=""""""]]
-[[!template id=sched time="""40""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-dev">#emacsconf-dev, speaker nick: edrx</a>""" startutc="""2023-12-02T19:00:00+0000""" endutc="""2023-12-02T19:40:00+0000""" start="""2:00""" end="""2:40""" title="""REPLs in strange places: Lua, LaTeX, LPeg, LPegRex, TikZ""" url="""/2023/talks/repl""" speakers="""Eduardo Ochs""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""repl""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-solo.html">BBB</a>""" startutc="""2023-12-02T19:20:00+0000""" endutc="""2023-12-02T19:40:00+0000""" start="""2:20""" end="""2:40""" title="""How I play TTRPGs in Emacs""" url="""/2023/talks/solo""" speakers="""Howard Abrams""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""solo""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-emacsconf.html">BBB</a>""" startutc="""2023-12-02T19:50:00+0000""" endutc="""2023-12-02T20:10:00+0000""" start="""2:50""" end="""3:10""" title="""EmacsConf.org: How we use Org Mode and TRAMP to organize and run a multi-track conference""" url="""/2023/talks/emacsconf""" speakers="""Sacha Chua""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""emacsconf""" note="""video posted"""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen, speaker nick: lispmacs</a>""" startutc="""2023-12-02T19:55:00+0000""" endutc="""2023-12-02T20:15:00+0000""" start="""2:55""" end="""3:15""" title="""Org-Mode workflow: informal reference tracking""" url="""/2023/talks/ref""" speakers="""Christopher Howard""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""ref""" note=""""""]]
-=======
 [[!template id=sched time="""10""" q-and-a="""<a href="https://pad.emacsconf.org/2023-sat-open">Etherpad</a>""" startutc="""2023-12-02T14:00:00+0000""" endutc="""2023-12-02T14:10:00+0000""" start="""9:00""" end="""9:10""" title="""Saturday opening remarks""" url="""/2023/talks/sat-open""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""sat-open""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://pad.emacsconf.org/2023-adventure">Etherpad</a>""" startutc="""2023-12-02T14:10:00+0000""" endutc="""2023-12-02T14:20:00+0000""" start="""9:10""" end="""9:20""" title="""An Org-Mode based text adventure game for learning the basics of Emacs, inside Emacs, written in Emacs Lisp""" url="""/2023/talks/adventure""" speakers="""Chung-hong Chan""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""adventure""" note="""captioned"""]]
+[[!template id=sched time="""10""" q-and-a="""none""" startutc="""2023-12-02T14:10:00+0000""" endutc="""2023-12-02T14:20:00+0000""" start="""9:10""" end="""9:20""" title="""An Org-Mode based text adventure game for learning the basics of Emacs, inside Emacs, written in Emacs Lisp""" url="""/2023/talks/adventure""" speakers="""Chung-hong Chan""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""adventure""" note="""captioned"""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-uni.html">BBB</a>""" startutc="""2023-12-02T14:30:00+0000""" endutc="""2023-12-02T14:50:00+0000""" start="""9:30""" end="""9:50""" title="""Authoring and presenting university courses with Emacs and a full libre software stack""" url="""/2023/talks/uni""" speakers="""James Howell""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""uni""" note=""""""]]
 [[!template id=sched time="""10""" q-and-a="""<a href="https://pad.emacsconf.org/2023-matplotllm">Etherpad</a>""" startutc="""2023-12-02T15:00:00+0000""" endutc="""2023-12-02T15:10:00+0000""" start="""10:00""" end="""10:10""" title="""MatplotLLM, iterative natural language data visualization in org-babel""" url="""/2023/talks/matplotllm""" speakers="""Abhinav Tushar""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""matplotllm""" note="""captioned"""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-teaching.html">BBB</a>""" startutc="""2023-12-02T15:05:00+0000""" endutc="""2023-12-02T15:25:00+0000""" start="""10:05""" end="""10:25""" title="""Teaching computer and data science with literate programming tools""" url="""/2023/talks/teaching""" speakers="""Marcus Birkenkrahe""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""teaching""" note="""captioned"""]]
@@ -44,11 +17,10 @@ Jump to: <a href="#date-2023-12-02">Sat Dec 2</a> - <a href="#date-2023-12-03">S
 [[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-nabokov.html">BBB</a>""" startutc="""2023-12-02T18:25:00+0000""" endutc="""2023-12-02T18:35:00+0000""" start="""1:25""" end="""1:35""" title="""Why Nabokov would use Org-Mode if he were writing today""" url="""/2023/talks/nabokov""" speakers="""Edmund Jorgensen""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""nabokov""" note="""captioned"""]]
 [[!template id=sched time="""10""" q-and-a="""none""" startutc="""2023-12-02T18:35:00+0000""" endutc="""2023-12-02T18:45:00+0000""" start="""1:35""" end="""1:45""" title="""Editor Integrated REPL Driven Development for all languages""" url="""/2023/talks/eval""" speakers="""Musa Al-hassy""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""eval""" note="""captioned"""]]
 [[!template id=sched time="""20""" q-and-a="""none""" startutc="""2023-12-02T18:50:00+0000""" endutc="""2023-12-02T19:10:00+0000""" start="""1:50""" end="""2:10""" title="""Collaborative data processing and documenting using org-babel""" url="""/2023/talks/collab""" speakers="""Jonathan Hartman, Lukas C. Bossert""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""collab""" note="""captioned"""]]
-[[!template id=sched time="""40""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf">#emacsconf, speaker nick: edrx</a>""" startutc="""2023-12-02T19:00:00+0000""" endutc="""2023-12-02T19:40:00+0000""" start="""2:00""" end="""2:40""" title="""REPLs in strange places: Lua, LaTeX, LPeg, LPegRex, TikZ""" url="""/2023/talks/repl""" speakers="""Eduardo Ochs""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""repl""" note=""""""]]
+[[!template id=sched time="""40""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-dev">#emacsconf-dev, speaker nick: edrx</a>""" startutc="""2023-12-02T19:00:00+0000""" endutc="""2023-12-02T19:40:00+0000""" start="""2:00""" end="""2:40""" title="""REPLs in strange places: Lua, LaTeX, LPeg, LPegRex, TikZ""" url="""/2023/talks/repl""" speakers="""Eduardo Ochs""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""repl""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-solo.html">BBB</a>""" startutc="""2023-12-02T19:20:00+0000""" endutc="""2023-12-02T19:40:00+0000""" start="""2:20""" end="""2:40""" title="""How I play TTRPGs in Emacs""" url="""/2023/talks/solo""" speakers="""Howard Abrams""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""solo""" note="""captioned"""]]
-[[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-doc.html">BBB</a>""" note="""Actually a general-audience talk; just on the development track for scheduling purposes""" startutc="""2023-12-02T19:50:00+0000""" endutc="""2023-12-02T20:30:00+0000""" start="""2:50""" end="""3:30""" title="""Literate Documentation with Emacs and Org Mode""" url="""/2023/talks/doc""" speakers="""Mike Hamrick""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""doc""" note="""captioned"""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf">#emacsconf, speaker nick: lispmacs</a>""" startutc="""2023-12-02T19:55:00+0000""" endutc="""2023-12-02T20:15:00+0000""" start="""2:55""" end="""3:15""" title="""Org-Mode workflow: informal reference tracking""" url="""/2023/talks/ref""" speakers="""Christopher Howard""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""ref""" note="""captioned"""]]
->>>>>>> b6497563dd469bd03d33f5447645170401718583
+[[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-doc.html">BBB</a>""" startutc="""2023-12-02T19:50:00+0000""" endutc="""2023-12-02T20:30:00+0000""" start="""2:50""" end="""3:30""" title="""Literate Documentation with Emacs and Org Mode""" url="""/2023/talks/doc""" speakers="""Mike Hamrick""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""doc""" note="""captioned"""]]
+[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen, speaker nick: lispmacs</a>""" startutc="""2023-12-02T19:55:00+0000""" endutc="""2023-12-02T20:15:00+0000""" start="""2:55""" end="""3:15""" title="""Org-Mode workflow: informal reference tracking""" url="""/2023/talks/ref""" speakers="""Christopher Howard""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""ref""" note="""captioned"""]]
 [[!template id=sched time="""10""" q-and-a="""<a href="https://pad.emacsconf.org/2023-unentangling">Etherpad</a>""" startutc="""2023-12-02T20:25:00+0000""" endutc="""2023-12-02T20:35:00+0000""" start="""3:25""" end="""3:35""" title="""(Un)entangling projects and repos""" url="""/2023/talks/unentangling""" speakers="""Alexey Bochkarev""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""unentangling""" note=""""""]]
 [[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-devel.html">BBB</a>""" startutc="""2023-12-02T20:45:00+0000""" endutc="""2023-12-02T20:55:00+0000""" start="""3:45""" end="""3:55""" title="""Emacs development updates""" url="""/2023/talks/devel""" speakers="""John Wiegley""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""devel""" note=""""""]]
 [[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-windows.html">BBB</a>""" startutc="""2023-12-02T20:45:00+0000""" endutc="""2023-12-02T21:25:00+0000""" start="""3:45""" end="""4:25""" title="""Windows into Freedom""" url="""/2023/talks/windows""" speakers="""Corwin Brust""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""windows""" note=""""""]]
@@ -60,26 +32,20 @@ Jump to: <a href="#date-2023-12-02">Sat Dec 2</a> - <a href="#date-2023-12-03">S
 [[!inline pages="internal(2023/schedule-2023-12-03)" raw="yes"]]
 
 <div class="schedule" data-start="2023-12-03T14:00:00+0000" data-end="2023-12-03T22:30:00+0000" data-tracks="General,Development">
-[[!template id=sched time="""5""" q-and-a="""""" startutc="""2023-12-03T13:59:00+0000""" endutc="""2023-12-03T14:04:00+0000""" start="""8:59""" end="""9:04""" title="""Sunday opening remarks""" url="""/2023/talks/sun-open""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""sun-open""" note=""""""]]
+[[!template id=sched time="""5""" q-and-a="""""" startutc="""2023-12-03T13:59:00+0000""" endutc="""2023-12-03T14:04:00+0000""" start="""8:59""" end="""9:04""" title="""Sunday opening remarks""" url="""/2023/talks/sun-open""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""sun-open""" note="""video posted"""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-hyperamp.html">BBB</a>""" startutc="""2023-12-03T14:05:00+0000""" endutc="""2023-12-03T14:25:00+0000""" start="""9:05""" end="""9:25""" title="""Top 10 ways Hyperbole amps up Emacs""" url="""/2023/talks/hyperamp""" speakers="""Robert Weiner""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""hyperamp""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf">#emacsconf</a>""" startutc="""2023-12-03T14:40:00+0000""" endutc="""2023-12-03T15:00:00+0000""" start="""9:40""" end="""10:00""" title="""Using Koutline for stream of thought journaling""" url="""/2023/talks/koutline""" speakers="""Matthew Jorgensen (PlasmaStrike)""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""koutline""" note=""""""]]
+[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen</a>""" startutc="""2023-12-03T14:40:00+0000""" endutc="""2023-12-03T15:00:00+0000""" start="""9:40""" end="""10:00""" title="""Using Koutline for stream of thought journaling""" url="""/2023/talks/koutline""" speakers="""Matthew Jorgensen (PlasmaStrike)""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""koutline""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-scheme.html">BBB</a>""" startutc="""2023-12-03T15:00:00+0000""" endutc="""2023-12-03T15:20:00+0000""" start="""10:00""" end="""10:20""" title="""Bringing joy to Scheme programming""" url="""/2023/talks/scheme""" speakers="""Andrew Tropin""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""scheme""" note="""captioned"""]]
 [[!template id=sched time="""15""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-parallel.html">BBB</a>""" startutc="""2023-12-03T15:10:00+0000""" endutc="""2023-12-03T15:25:00+0000""" start="""10:10""" end="""10:25""" title="""Parallel text replacement""" url="""/2023/talks/parallel""" speakers="""Lovro, Valentino Picotti""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""parallel""" note=""""""]]
 [[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-eat.html">BBB</a>""" startutc="""2023-12-03T15:35:00+0000""" endutc="""2023-12-03T15:45:00+0000""" start="""10:35""" end="""10:45""" title="""Eat and Eat powered Eshell, fast featureful terminal inside Emacs""" url="""/2023/talks/eat""" speakers="""Akib Azmain Turja""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""eat""" note=""""""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-world.html">BBB</a>""" startutc="""2023-12-03T15:35:00+0000""" endutc="""2023-12-03T15:55:00+0000""" start="""10:35""" end="""10:55""" title="""GNU Emacs: A World of Possibilities""" url="""/2023/talks/world""" speakers="""Anand Tamariya""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""world""" note="""captioned"""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-poltys.html">BBB</a>""" startutc="""2023-12-03T16:00:00+0000""" endutc="""2023-12-03T16:20:00+0000""" start="""11:00""" end="""11:20""" title="""The browser in a buffer""" url="""/2023/talks/poltys""" speakers="""Michael Bauer""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""poltys""" note=""""""]]
-<<<<<<< HEAD
-[[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-world.html">BBB</a>""" startutc="""2023-12-03T16:10:00+0000""" endutc="""2023-12-03T16:30:00+0000""" start="""11:10""" end="""11:30""" title="""GNU Emacs: A World of Possibilities""" url="""/2023/talks/world""" speakers="""Anand Tamariya""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""world""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen, speaker nick: wasamasa</a>""" startutc="""2023-12-03T16:35:00+0000""" endutc="""2023-12-03T16:55:00+0000""" start="""11:35""" end="""11:55""" title="""Speedcubing in Emacs""" url="""/2023/talks/cubing""" speakers="""wasamasa""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""cubing""" note=""""""]]
-[[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-flat.html">BBB</a>""" startutc="""2023-12-03T16:45:00+0000""" endutc="""2023-12-03T16:55:00+0000""" start="""11:45""" end="""11:55""" title="""A modern Emacs look-and-feel without pain""" url="""/2023/talks/flat""" speakers="""Pedro A. Aranda""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""flat""" note=""""""]]
-=======
 [[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-flat.html">BBB</a>""" startutc="""2023-12-03T16:10:00+0000""" endutc="""2023-12-03T16:20:00+0000""" start="""11:10""" end="""11:20""" title="""A modern Emacs look-and-feel without pain""" url="""/2023/talks/flat""" speakers="""Pedro A. Aranda""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""flat""" note=""""""]]
-[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf">#emacsconf, speaker nick: wasamasa</a>""" startutc="""2023-12-03T16:35:00+0000""" endutc="""2023-12-03T16:55:00+0000""" start="""11:35""" end="""11:55""" title="""Speedcubing in Emacs""" url="""/2023/talks/cubing""" speakers="""wasamasa""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""cubing""" note="""captioned"""]]
+[[!template id=sched time="""20""" q-and-a="""<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen">#emacsconf-gen, speaker nick: wasamasa</a>""" startutc="""2023-12-03T16:35:00+0000""" endutc="""2023-12-03T16:55:00+0000""" start="""11:35""" end="""11:55""" title="""Speedcubing in Emacs""" url="""/2023/talks/cubing""" speakers="""wasamasa""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""cubing""" note="""captioned"""]]
 [[!template id=sched time="""20""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-emacsen.html">BBB</a>""" startutc="""2023-12-03T16:35:00+0000""" endutc="""2023-12-03T16:55:00+0000""" start="""11:35""" end="""11:55""" title="""The Emacsen family, the design of an Emacs and the importance of Lisp""" url="""/2023/talks/emacsen""" speakers="""Fermin""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""emacsen""" note="""captioned"""]]
->>>>>>> b6497563dd469bd03d33f5447645170401718583
 [[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-emms.html">BBB</a>""" startutc="""2023-12-03T18:00:00+0000""" endutc="""2023-12-03T18:40:00+0000""" start="""1:00""" end="""1:40""" title="""Emacs MultiMedia System (EMMS)""" url="""/2023/talks/emms""" speakers="""Yoni Rabkin""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""emms""" note="""captioned"""]]
 [[!template id=sched time="""35""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-gc.html">BBB</a>""" startutc="""2023-12-03T18:00:00+0000""" endutc="""2023-12-03T18:35:00+0000""" start="""1:00""" end="""1:35""" title="""emacs-gc-stats: Does garbage collection actually slow down Emacs?""" url="""/2023/talks/gc""" speakers="""Ihor Radchenko""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""gc""" note=""""""]]
-[[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-hyperdrive.html">BBB</a>""" note="""Actually a general-audience talk; just on the development track for scheduling purposes""" startutc="""2023-12-03T18:50:00+0000""" endutc="""2023-12-03T19:30:00+0000""" start="""1:50""" end="""2:30""" title="""hyperdrive.el: Peer-to-peer filesystem in Emacs""" url="""/2023/talks/hyperdrive""" speakers="""Joseph Turner and Protesilaos Stavrou""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""hyperdrive""" note="""captioned"""]]
+[[!template id=sched time="""40""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-hyperdrive.html">BBB</a>""" startutc="""2023-12-03T18:50:00+0000""" endutc="""2023-12-03T19:30:00+0000""" start="""1:50""" end="""2:30""" title="""hyperdrive.el: Peer-to-peer filesystem in Emacs""" url="""/2023/talks/hyperdrive""" speakers="""Joseph Turner and Protesilaos Stavrou""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""hyperdrive""" note="""captioned"""]]
 [[!template id=sched time="""30""" q-and-a="""none""" startutc="""2023-12-03T18:55:00+0000""" endutc="""2023-12-03T19:25:00+0000""" start="""1:55""" end="""2:25""" title="""Programming with steno""" url="""/2023/talks/steno""" speakers="""Daniel Alejandro Tapia""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""steno""" note="""captioned"""]]
 [[!template id=sched time="""10""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-mentor.html">BBB</a>""" startutc="""2023-12-03T19:35:00+0000""" endutc="""2023-12-03T19:45:00+0000""" start="""2:35""" end="""2:45""" title="""Mentoring VS-Coders as an Emacsian (or How to show not tell people about the wonders of Emacs)""" url="""/2023/talks/mentor""" speakers="""Jeremy Friesen""" track="""General""" watch="""https://emacsconf.org/2023/watch/gen""" slug="""mentor""" note="""captioned"""]]
 [[!template id=sched time="""15""" q-and-a="""<a href="https://media.emacsconf.org/2023/current/bbb-lspocaml.html">BBB</a>""" startutc="""2023-12-03T19:45:00+0000""" endutc="""2023-12-03T20:00:00+0000""" start="""2:45""" end="""3:00""" title="""Writing a language server in OCaml for Emacs, fun, and profit""" url="""/2023/talks/lspocaml""" speakers="""Austin Theriault""" track="""Development""" watch="""https://emacsconf.org/2023/watch/dev""" slug="""lspocaml""" note="""captioned"""]]