Resolved merge conflict of cutsom-words.txt (#20956)

* Resolved merge conflict * Resolved merge conflict Co-authored-by: maulikjoshi <[email protected]>
Azure · Oct 1, 2022 · 93a9ba1 · 93a9ba1
1 parent 3049c38
commit 93a9ba1
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -2743,7 +2743,24 @@ smallrc
 Autotune
 Showmount
 autogrid
+remediatable
 KubeProxyConfig
 IPVS
 TCPFIN
 taginheritance
+questionanswers
+Satya
+Nadella
+Telangana
+servicehealth
+metricstaticthreshold
+metricsdynamicthreshold
+logalert
+logalertv2
+smartalert
+webtestalert
+logalertv1numresult
+logalertv1metricmeasurement
+resourcehealth
+activitylog
+budget