From 0e14be7742e02f7bc4621409f194666b48213606 Mon Sep 17 00:00:00 2001 From: Kale <460412008@qq.com> Date: Sat, 2 Apr 2016 23:00:44 +0800 Subject: [PATCH 1/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e20ed1e..133644e 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,5 @@ For someone -- ### 学生基本信息 -姓名： +姓名： 学员一：__________ 学员二：__________ 学员三：__________ From 97c5ad039ddcb540ac7216223b9ae7b7a0fdc38c Mon Sep 17 00:00:00 2001 From: Kale <460412008@qq.com> Date: Wed, 6 Apr 2016 20:03:28 +0800 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 133644e..05b4f9b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,6 @@ For someone -- -### 学生基本信息 +### 学生基本信息表 姓名： 学员一：__________ 学员二：__________ 学员三：__________ From fad4f727f5506098523f6145da58f3bd523de989 Mon Sep 17 00:00:00 2001 From: Kale <460412008@qq.com> Date: Wed, 6 Apr 2016 20:14:21 +0800 Subject: [PATCH 3/6] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 05b4f9b..cac6ea2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ For someone -- -### 学生基本信息表 +### 学生基本信息表 +教师：kale 姓名： 学员一：__________ 学员二：__________ 学员三：__________ From e8edc465d8075f6d15e2793ee44c7145be891539 Mon Sep 17 00:00:00 2001 From: fiona66 Date: Wed, 6 Apr 2016 20:42:57 +0800 Subject: [PATCH 4/6] Create README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..2689319 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +# JustTest +For someone + +dd From 1a2f690ad76d7d53adc2ca84a072cbdfbc43ab5d Mon Sep 17 00:00:00 2001 From: fiona66 Date: Wed, 6 Apr 2016 20:43:57 +0800 Subject: [PATCH 5/6] add name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2689319..bae7e37 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # JustTest For someone -dd +liuliu \ No newline at end of file From f19e445d53c51f5792eef78d0ddb73e66dd84bda Mon Sep 17 00:00:00 2001 From: fiona66 Date: Wed, 6 Apr 2016 21:03:46 +0800 Subject: [PATCH 6/6] add name --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 543e905..6ee0f8b 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,8 @@ # JustTest For someone - -<<<<<<< HEAD -liuliu -======= -- ### 学生基本信息表 教师：kale 姓名： -学员一：__________ 学员二：__________ 学员三：__________ ->>>>>>> origin/master +学员一：___66_______ 学员二：__________ 学员三：__________ \ No newline at end of file