diff --git a/冲突.txt b/冲突.txt
index a9ffe5a..7f88605 100644
--- a/冲突.txt
+++ b/冲突.txt
@@ -1 +1 @@
-本地修改
\ No newline at end of file
+远程修改
\ No newline at end of file