summaryrefslogtreecommitdiffstats
path: root/2020/schedule
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2020-11-15 22:15:41 -0500
committerSacha Chua <sacha@sachachua.com>2020-11-15 22:15:41 -0500
commit9ef20d301a7a53ce83f96a4013293e6675b613bc (patch)
tree2fcc1b0303773b389ee3819e078422ecc711b2c5 /2020/schedule
parentde7ea920f74dfb8c9dc1adcd0f7b823f876d946c (diff)
downloademacsconf-wiki-9ef20d301a7a53ce83f96a4013293e6675b613bc.tar.xz
emacsconf-wiki-9ef20d301a7a53ce83f96a4013293e6675b613bc.zip
Include Erik in pathing talk
Diffstat (limited to '')
-rw-r--r--2020/schedule-details.txt2
-rw-r--r--2020/schedule.md2
-rw-r--r--2020/schedule/29.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/2020/schedule-details.txt b/2020/schedule-details.txt
index 4fcae0f4..4e80a7ed 100644
--- a/2020/schedule-details.txt
+++ b/2020/schedule-details.txt
@@ -42,7 +42,7 @@
<tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
<tr><td width=100> 1:16 PM</td><td width=100> 1:26 PM</td><td><a href="/2020/schedule/27">State of Retro Gaming in Emacs</a></td><td>Vasilij "wasamasa" Schneidermann</td></tr>
<tr><td width=100> 1:29 PM</td><td width=100> 2:19 PM</td><td><a href="/2020/schedule/28">Welcome To The Dungeon</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
-<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Corwin Brust</td></tr>
+<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
<tr><td width=100> 2:45 PM</td><td width=100> 2:55 PM</td><td><a href="/2020/schedule/30">A tour of vterm</a></td><td>Gabriele Bozzola (@sbozzolo)</td></tr>
<tr><td width=100> 2:58 PM</td><td width=100> 3:08 PM</td><td><a href="/2020/schedule/31">Lakota Language and Emacs</a></td><td>Grant Shangreaux</td></tr>
<tr><td width=100> 3:11 PM</td><td width=100> 3:31 PM</td><td><a href="/2020/schedule/32">Object Oriented Code in the Gnus Newsreader</a></td><td>Eric Abrahamsen</td></tr>
diff --git a/2020/schedule.md b/2020/schedule.md
index 409c5aab..ff90af3c 100644
--- a/2020/schedule.md
+++ b/2020/schedule.md
@@ -52,7 +52,7 @@ All the times below are given in EST time. You can check out the individual talk
<tr><td width=100> 1:03 PM</td><td width=100> 1:13 PM</td><td><a href="/2020/schedule/26">Emacs as a Highschooler: How It Changed My Life</a></td><td>Pierce Wang</td></tr>
<tr><td width=100> 1:16 PM</td><td width=100> 1:26 PM</td><td><a href="/2020/schedule/27">State of Retro Gaming in Emacs</a></td><td>Vasilij "wasamasa" Schneidermann</td></tr>
<tr><td width=100> 1:29 PM</td><td width=100> 2:19 PM</td><td><a href="/2020/schedule/28">Welcome To The Dungeon</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
-<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Corwin Brust</td></tr>
+<tr><td width=100> 2:22 PM</td><td width=100> 2:42 PM</td><td><a href="/2020/schedule/29">Pathing of Least Resistance</a></td><td>Erik Elmshauser and Corwin Brust</td></tr>
<tr><td width=100> 2:45 PM</td><td width=100> 2:55 PM</td><td><a href="/2020/schedule/30">A tour of vterm</a></td><td>Gabriele Bozzola (@sbozzolo)</td></tr>
<tr><td width=100> 2:58 PM</td><td width=100> 3:08 PM</td><td><a href="/2020/schedule/31">Lakota Language and Emacs</a></td><td>Grant Shangreaux</td></tr>
<tr><td width=100> 3:11 PM</td><td width=100> 3:31 PM</td><td><a href="/2020/schedule/32">Object Oriented Code in the Gnus Newsreader</a></td><td>Eric Abrahamsen</td></tr>
diff --git a/2020/schedule/29.md b/2020/schedule/29.md
index f4723d5f..19dc6700 100644
--- a/2020/schedule/29.md
+++ b/2020/schedule/29.md
@@ -1,5 +1,5 @@
[[!meta title="Pathing of Least Resistance"]]
-[[!meta copyright="Copyright &copy; 2020 Corwin Brust"]]
+[[!meta copyright="Copyright &copy; 2020 Erik Elmshauser and Corwin Brust"]]
<!-- To edit the talk information, change /2020/info/TALKID.md. Boilerplate automatically generated from submissions.org using conf/generate-schedule-files --->