From c7488f9c103ea90cd89f32b31d6a13d69545c65e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=88=E6=B0=B8?= Date: Sun, 26 Nov 2017 23:18:42 +0800 Subject: [PATCH 1/4] yongshouzhang Translating --- .../20170622 A users guide to links in the Linux filesystem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tech/20170622 A users guide to links in the Linux filesystem.md b/sources/tech/20170622 A users guide to links in the Linux filesystem.md index 5fc4defaeb..0a871028de 100644 --- a/sources/tech/20170622 A users guide to links in the Linux filesystem.md +++ b/sources/tech/20170622 A users guide to links in the Linux filesystem.md @@ -1,4 +1,4 @@ -Translating by Snapcrafter +Translating by yongshouzhang A user's guide to links in the Linux filesystem ============================================================ From 16e481e670f500808953e5775b055681c9e97895 Mon Sep 17 00:00:00 2001 From: zhangshoyong Date: Sun, 26 Nov 2017 23:30:37 +0800 Subject: [PATCH 2/4] Revert "yongshouzhang Translating" This reverts commit c7488f9c103ea90cd89f32b31d6a13d69545c65e. --- .../20170622 A users guide to links in the Linux filesystem.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/tech/20170622 A users guide to links in the Linux filesystem.md b/sources/tech/20170622 A users guide to links in the Linux filesystem.md index 0a871028de..5fc4defaeb 100644 --- a/sources/tech/20170622 A users guide to links in the Linux filesystem.md +++ b/sources/tech/20170622 A users guide to links in the Linux filesystem.md @@ -1,4 +1,4 @@ -Translating by yongshouzhang +Translating by Snapcrafter A user's guide to links in the Linux filesystem ============================================================ From 1563bbe1de2eeca62e56312950525707690c3447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=88=E6=B0=B8?= Date: Sun, 26 Nov 2017 23:40:20 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=B8=AD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20170622 A users guide to links in the Linux filesystem.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources/tech/20170622 A users guide to links in the Linux filesystem.md b/sources/tech/20170622 A users guide to links in the Linux filesystem.md index 0a871028de..3cb59aaacb 100644 --- a/sources/tech/20170622 A users guide to links in the Linux filesystem.md +++ b/sources/tech/20170622 A users guide to links in the Linux filesystem.md @@ -1,4 +1,6 @@ Translating by yongshouzhang + + A user's guide to links in the Linux filesystem ============================================================ From aa163e71376aa4f8304f2796c9fe5e60c1bcc09c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=AE=88=E6=B0=B8?= Date: Sun, 26 Nov 2017 23:55:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=B2=A1=E4=BF=AE=E6=94=B9=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20170622 A users guide to links in the Linux filesystem.md | 1 - 1 file changed, 1 deletion(-) diff --git a/sources/tech/20170622 A users guide to links in the Linux filesystem.md b/sources/tech/20170622 A users guide to links in the Linux filesystem.md index e1b29fd1eb..3cb59aaacb 100644 --- a/sources/tech/20170622 A users guide to links in the Linux filesystem.md +++ b/sources/tech/20170622 A users guide to links in the Linux filesystem.md @@ -1,7 +1,6 @@ Translating by yongshouzhang ->>>>>>> 1563bbe1de2eeca62e56312950525707690c3447 A user's guide to links in the Linux filesystem ============================================================