branch: externals/org
commit 5ed40ab2669b5d89e3ea61b5be691e3250bbe5e7
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
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.
---
etc/ORG-NEWS | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b0a8939..a9c08dd 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -912,11 +912,7 @@ In all Babel libraries, the absence of a ~:results~ header
should
produce the same result than setting ~:results value~, unless there is
an option to explicitly create an exception.
-<<<<<<< HEAD
See
[[msg:ca+a2izaziafmegpbql6qgrzrwevvlvc0duw++t4gcf3nguw...@mail.gmail.com][this
thread]] for more context.
-=======
-See
[[https://list.orgmode.org/ca+a2izaziafmegpbql6qgrzrwevvlvc0duw++t4gcf3nguw...@mail.gmail.com/][this
thread]] for more context.
->>>>>>> bugfix
*** New option in ~org-attach-store-link-p~
@@ -5661,11 +5657,7 @@ that Calc formulas can operate on them.
The new system has a technically cleaner implementation and more
possibilities for capturing different types of data. See
-<<<<<<< HEAD
[[msg:c46f10dc-de51-43d4-affe-f71e440d1...@gmail.com][Carsten's
announcement]] for more details.
-=======
-
[[https://list.orgmode.org/c46f10dc-de51-43d4-affe-f71e440d1...@gmail.com][Carsten's
announcement]] for more details.
->>>>>>> bugfix
To switch over to the new system:
@@ -5796,11 +5788,7 @@ that Calc formulas can operate on them.
**** Modified link escaping
-<<<<<<< HEAD
David Maus worked on `org-link-escape'. See
[[msg:87k4gysacq.wl%dm...@ictsoc.de][his message]]:
-=======
- David Maus worked on `org-link-escape'. See
[[https://list.orgmode.org/87k4gysacq.wl%dm...@ictsoc.de][his message]]:
->>>>>>> bugfix
: Percent escaping is used in Org mode to escape certain characters
: in links that would either break the parser (e.g. square brackets
