fix git conflict

Signed-off-by: lance6716 <lance6716@gmail.com>
pingcap · May 23, 2023 · 88d42a8 · 88d42a8
1 parent 1c8aa96
commit 88d42a8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/build/BUILD.bazel b/build/BUILD.bazel
@@ -123,7 +123,7 @@ nogo(
                "//build/linter/asciicheck:asciicheck",
                "//build/linter/bodyclose:bodyclose",
                "//build/linter/durationcheck:durationcheck",
-               "//build/linter/etcdconfig:etcdconfig"
+               "//build/linter/etcdconfig:etcdconfig",
                "//build/linter/exportloopref:exportloopref",
                "//build/linter/forcetypeassert:forcetypeassert",
                "//build/linter/gofmt:gofmt",