Resolved merge conflict (#20845)

Co-authored-by: maulikjoshi <[email protected]>
Azure · Oct 4, 2022 · 3e66acd · 3e66acd
1 parent 5defd7e
commit 3e66acd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/custom-words.txt b/custom-words.txt
@@ -2781,4 +2781,4 @@ autogrid
 KubeProxyConfig
 IPVS
 TCPFIN
-taginheritance
+taginheritance