From a55f770dcf10277f3e6c5e86cf90ee5cf558623d Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 11 Jan 2020 22:38:32 -0500
Subject: orgmode-backports.org: Update

---
 orgmode-backports.org | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/orgmode-backports.org b/orgmode-backports.org
index 80e8ee4..d7909ec 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -613,11 +613,26 @@ syncing, but that don't seem appropriate for Org backport.
   Paul Eggert
   Sun Sep 10 22:31:23 2017 -0700
 
-** emacs 27 branch [182/183]
+** emacs 27 branch [184/185]
 :PROPERTIES:
 :ref:      origin/emacs-27
 :END:
 
+
+- [X] 088bfcc2d80eed44864147f3491eff69e4eb5cd8
+
+  Move “Fix some broken conditional forms” to master
+  Paul Eggert
+  Sun Jan 5 11:50:31 2020 -0800
+
+- [X] f95a2b83014a810d508448473b20186d55485efd
+
+  Fix some broken conditional forms
+  Paul Eggert
+  Sat Jan 4 11:18:13 2020 -0800
+
+  Reverted by above commit.
+
 - [X] 4cd143aded5e40fe801575c669dd464210caaf7e
 
   Fix copyright years by hand
@@ -1863,11 +1878,23 @@ syncing, but that don't seem appropriate for Org backport.
 
   This is on master.
 
-** master branch [4/5]
+** master branch [5/7]
 :PROPERTIES:
 :ref:      origin/master
 :END:
 
+- [X] f9094332287cf1434788f6407347265350ae5dd5
+
+  Merge from origin/emacs-27
+  Paul Eggert
+  Sun Jan 5 11:44:48 2020 -0800
+
+- [ ] f95a2b83014a810d508448473b20186d55485efd
+
+  Fix some broken conditional forms
+  Paul Eggert
+  Sat Jan 4 11:18:13 2020 -0800
+
 - [X] c6fb86b40bebf597fccbe4eba58ceea83bd9700f
 
   Merge from origin/emacs-27
-- 
cgit v1.2.3