resolve conflict

Signed-off-by: DanRoscigno <[email protected]>
StarRocks · Feb 26, 2025 · f166e5b · f166e5b
1 parent 562cb5c
commit f166e5b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/docs/translation/README.md b/docs/translation/README.md
@@ -185,3 +185,4 @@ Changes not staged for commit:
   (use "git restore <file>..." to discard changes in working directory)
 	modified:   docs/zh/developers/trace-tools/Trace.md
 ```
+