Resolved merge conflict (#20845)

Co-authored-by: maulikjoshi <[email protected]>
Azure · Sep 23, 2022 · 42f5ee0 · 42f5ee0
1 parent 99c0884
commit 42f5ee0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/custom-words.txt b/custom-words.txt
@@ -2746,4 +2746,4 @@ autogrid
 KubeProxyConfig
 IPVS
 TCPFIN
-taginheritance
+taginheritance