From 6f6dce3f0b41b60dfb938f0db42229e92c14c39f Mon Sep 17 00:00:00 2001 From: decrystal Date: Tue, 5 Nov 2019 13:11:06 +0800 Subject: [PATCH 1/2] test conflict --- apple.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple.txt b/apple.txt index 9287b26..34ae7c6 100644 --- a/apple.txt +++ b/apple.txt @@ -1,3 +1,3 @@ aaaaaa -bbbbbb +bbbbbb==edit by hothot=fix cccccc From 53d5cdf860ba65095f23f9346d1fbfcdff49ccb1 Mon Sep 17 00:00:00 2001 From: decrystal Date: Sat, 9 Nov 2019 15:01:50 +0800 Subject: [PATCH 2/2] origin_ssh --- apple.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/apple.txt b/apple.txt index 41145e3..87da59d 100644 --- a/apple.txt +++ b/apple.txt @@ -1,3 +1,4 @@ aaaaa bbbbbb =edit by master cccccc=abcdef==edit by hot-fix +edit by _ssh