From 9dc60e4088147df05de27a26e3c53d95734e8b2b Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sun, 16 Aug 2020 22:40:26 +0530
Subject: [PATCH] Update history regarding cherry-picks from docs-40

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 8393ff2d..7ed77985 100644
--- a/History.markdown
+++ b/History.markdown
@@ -12,6 +12,7 @@
   * Update resources.md (#7864)
   * Extra apostrophes in an URL (#8319)
   * Clarify target of subordinate clause (#8320)
+  * Cherry-pick commits from conflicting branch `docs-40`
 
 ### Development Fixes