解决冲突

yuanxinan · Mar 5, 2019 · 5afa24b · 5afa24b
2 parents c9893ea + a8c263c
commit 5afa24b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/日记.txt b/日记.txt
@@ -1 +1 @@
-12322222
+123456