fix conflict (#17624)

Azure · Feb 7, 2022 · 0cc76de · 0cc76de
1 parent 944f6d4
commit 0cc76de
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/custom-words.txt b/custom-words.txt
@@ -2465,4 +2465,4 @@ testrun
 loadtest
 xvalue
 yvalue
-servermetrics
+servermetrics