summaryrefslogtreecommitdiffstats
path: root/2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end...
diff options
context:
space:
mode:
authorEmacsConf Organizers <orga@front0.emacsconf.org>2021-01-24 05:17:02 +0000
committerEmacsConf Organizers <orga@front0.emacsconf.org>2021-01-24 05:17:02 +0000
commite0e7dcfde813d2995cc6283db424d0a9c1d49e97 (patch)
tree05c73f4785881c0d4310349e05090f2df3e49f75 /2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt
parent577704c04d530e715ba86526acd0a3d96117d13e (diff)
parent4654f2f81b12c9e52bd72e5f689360905cd98e88 (diff)
downloademacsconf-wiki-e0e7dcfde813d2995cc6283db424d0a9c1d49e97.tar.xz
emacsconf-wiki-e0e7dcfde813d2995cc6283db424d0a9c1d49e97.zip
Merge branch 'master' of git://git.emacsconf.org/emacsconf-wiki
Diffstat (limited to '2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt')
-rw-r--r--2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt4
1 files changed, 2 insertions, 2 deletions
diff --git a/2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt b/2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt
index 8e82bdbd..ba6afec0 100644
--- a/2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt
+++ b/2020/subtitles/emacsconf-2020--12-one-big-ass-org-file-or-multiple-tiny-ones-finally-the-end-of-the-debate--leo-vivier.vtt
@@ -159,7 +159,7 @@ it's not too small; you just
make it a little larger--but
00:01:51.360 --> 00:01:56.719
-Carl basically has a file with
+Karl basically has a file with
00:01:56.719 --> 00:02:01.759
126,000 lines. I'm just going to pause
@@ -987,7 +987,7 @@ but it's a browser extension that is
developed by one of my friends
00:12:12.399 --> 00:12:15.680
-over at Ranger whose name is Li Fon (??) and
+over at Ranger whose name is Li Fong (??) and
00:12:16.160 --> 00:12:18.240
it's very useful. I'm someone who uses a