diff --git a/版本冲突测试文件.txt b/版本冲突测试文件.txt
deleted file mode 100644
index e69de29..0000000