Kyle Meyer 5ed40ab266 ORG-NEWS: Clean up leftover conflicts ... The merge in e64d5bcc6 (Merge branch 'bugfix', 2021-09-25) left several unresolved conflicts. One was cleaned up later in db67c7e92 (Move some ob-*el files to the new org-contrib repo, 2021-09-26). Take care of the other ones.		2021-09-29 00:03:17 -04:00
..
csl	oc-csl: Implement `csl' citation processor	2021-07-09 08:47:14 +02:00
schema	Backport commit f1f351def from Emacs	2021-06-27 23:30:22 -04:00
styles	Update copyright year to 2021	2021-01-01 14:59:01 -05:00
Makefile	oc-csl: Implement `csl' citation processor	2021-07-09 08:47:14 +02:00
ORG-NEWS	ORG-NEWS: Clean up leftover conflicts	2021-09-29 00:03:17 -04:00