summaryrefslogtreecommitdiffstats
path: root/2023/info/sat-open-before.md
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--2023/info/sat-open-before.md9
1 files changed, 1 insertions, 8 deletions
diff --git a/2023/info/sat-open-before.md b/2023/info/sat-open-before.md
index d68cce90..b4fcaea0 100644
--- a/2023/info/sat-open-before.md
+++ b/2023/info/sat-open-before.md
@@ -5,20 +5,13 @@ The following image shows where the talk is in the schedule for Sat 2023-12-02.
</div>
[[!toc ]]
-<<<<<<< HEAD
-Format: 10-min talk
+Format: 6-min talk followed by pad Q&A (<a href="https://chat.emacsconf.org/?join=emacsconf,emacsconf-org,emacsconf-accessible,emacsconf-dev,emacsconf-gen">#emacsconf-gen</a>)
Discuss on IRC: [#emacsconf-gen](https://chat.emacsconf.org/?join=emacsconf,emacsconf-gen)
-Status: Q&A open for participation
-=======
-Format: 6-min talk; Q&A: Etherpad <https://pad.emacsconf.org/2023-sat-open>
-Discuss on IRC: [#emacsconf](https://chat.emacsconf.org/?join=emacsconf)
Status: Ready to stream
->>>>>>> b6497563dd469bd03d33f5447645170401718583
<div>Times in different timezones:</div><div class="times" start="2023-12-02T14:00:00Z" end="2023-12-02T14:10:00Z"><div class="conf-time">Saturday, Dec 2 2023, ~9:00 AM - 9:10 AM EST (US/Eastern)</div><div class="others"><div>which is the same as:</div>Saturday, Dec 2 2023, ~8:00 AM - 8:10 AM CST (US/Central)<br />Saturday, Dec 2 2023, ~7:00 AM - 7:10 AM MST (US/Mountain)<br />Saturday, Dec 2 2023, ~6:00 AM - 6:10 AM PST (US/Pacific)<br />Saturday, Dec 2 2023, ~2:00 PM - 2:10 PM UTC <br />Saturday, Dec 2 2023, ~3:00 PM - 3:10 PM CET (Europe/Paris)<br />Saturday, Dec 2 2023, ~4:00 PM - 4:10 PM EET (Europe/Athens)<br />Saturday, Dec 2 2023, ~7:30 PM - 7:40 PM IST (Asia/Kolkata)<br />Saturday, Dec 2 2023, ~10:00 PM - 10:10 PM +08 (Asia/Singapore)<br />Saturday, Dec 2 2023, ~11:00 PM - 11:10 PM JST (Asia/Tokyo)</div></div><div><a href="/2023/watch/gen/">Find out how to watch and participate</a></div>
-
# Description
<!-- End of emacsconf-publish-before-page --> \ No newline at end of file