summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-04-29 08:57:57 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-08 16:40:18 -0700
commitef1f065f0a51340649f0b8cc3afab3dffb6c50de (patch)
tree71b2f4a58f97b6cc0fd71b44ccd5f48f0494645a
parentd81cf30f953eec217efa62597e22015500728fed (diff)
cherry-ignore: Add a patch that was manually backported
-rw-r--r--bin/.cherry-ignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore
index 520cf214645..a5df036efc6 100644
--- a/bin/.cherry-ignore
+++ b/bin/.cherry-ignore
@@ -14,4 +14,7 @@ b031c643491a92a5574c7a4bd659df33f2d89bb6
5c30fffeec1732c21d600c036f95f8cdb1bb5487
# This doesn't actually appliy to 19.0
-29179f58c6ba8099859ea25900214dbbd3814a92 \ No newline at end of file
+29179f58c6ba8099859ea25900214dbbd3814a92
+
+# This was superceeded by a manual backport from ken
+6981069fc805da1afc867ca3c905075d146d7ff9