From 1193c27049a013c253a553c9c78a6e2b4ad6fa6c Mon Sep 17 00:00:00 2001 From: Ryosuke Date: Wed, 17 May 2017 13:00:01 +0900 Subject: [PATCH 01/15] members --- members.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 members.md diff --git a/members.md b/members.md new file mode 100644 index 0000000..54e9e84 --- /dev/null +++ b/members.md @@ -0,0 +1 @@ +# tsukubaguide_6 From 7c8102d1e3d9850fb11be4a258121f0b8a878c4a Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 17 May 2017 13:02:49 +0900 Subject: [PATCH 02/15] team6 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 54e9e84..9b30d60 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # tsukubaguide_6 +kimura \ No newline at end of file From c8ada6f39b8447e5e97a346bf29feec2ac12732f Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 17 May 2017 13:05:34 +0900 Subject: [PATCH 03/15] team6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b30d60..767cf07 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # tsukubaguide_6 -kimura \ No newline at end of file +わけわからん \ No newline at end of file From 865f5cabd65e0eef0e381a58f0667ca95ef5811b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B7=9D=E5=A4=A7=E6=B2=B3?= Date: Wed, 17 May 2017 13:33:25 +0900 Subject: [PATCH 04/15] add profiles of saga and watanabe --- member.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 member.md diff --git a/member.md b/member.md new file mode 100644 index 0000000..b314b96 --- /dev/null +++ b/member.md @@ -0,0 +1 @@ +筑波を紹介しましょう \ No newline at end of file From e461333cd7e5c1c5e6b2685daab838466e091a17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=80=89=20=E7=91=A0=E7=B6=AD?= Date: Wed, 17 May 2017 13:46:42 +0900 Subject: [PATCH 05/15] commit --- members.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/members.md b/members.md index 54e9e84..13960e3 100644 --- a/members.md +++ b/members.md @@ -1 +1,3 @@ # tsukubaguide_6 + +筑波大学は広いです。 \ No newline at end of file From 879c7c896bcf82c4553b34f32f4cbe0276a08ef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B7=9D=E5=A4=A7=E6=B2=B3?= Date: Wed, 17 May 2017 13:50:40 +0900 Subject: [PATCH 06/15] add profiles of saga and watanabe --- members.md | 1 + 1 file changed, 1 insertion(+) diff --git a/members.md b/members.md index 54e9e84..4d8053d 100644 --- a/members.md +++ b/members.md @@ -1 +1,2 @@ +大河です # tsukubaguide_6 From ab3ebcd6bff2334bc9babab6e01eabdb307eecb2 Mon Sep 17 00:00:00 2001 From: Ryosuke Date: Wed, 17 May 2017 14:03:07 +0900 Subject: [PATCH 07/15] add profiles of kimura --- members.md | 1 + 1 file changed, 1 insertion(+) diff --git a/members.md b/members.md index 54e9e84..78a01d4 100644 --- a/members.md +++ b/members.md @@ -1 +1,2 @@ # tsukubaguide_6 +木村です。 \ No newline at end of file From 1bbf4ba8c046cd9b9cb09f9f4f9992a35e6eb8df Mon Sep 17 00:00:00 2001 From: Ryosuke Date: Wed, 17 May 2017 14:17:30 +0900 Subject: [PATCH 08/15] =?UTF-8?q?=E8=A7=A3=E6=B1=BA=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- members.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/members.md b/members.md index e9230e1..d30c621 100644 --- a/members.md +++ b/members.md @@ -1,8 +1,8 @@ 大河です -# tsukubaguide_6 -<<<<<<< HEAD + + 木村です。 -======= + 筑波大学は広いです。 ->>>>>>> 723459c694474c28df0251206a4c5f0fcb8fc20c + From 9d586547b48b24d3e70d7e7e35592b078c342dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A2=93=E6=B0=B7=E9=9A=BC=08=E4=B9=9F?= Date: Wed, 17 May 2017 14:19:01 +0900 Subject: [PATCH 09/15] first commit --- members.md | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/members.md b/members.md index e9230e1..c21a7b0 100644 --- a/members.md +++ b/members.md @@ -1,8 +1 @@ -大河です -# tsukubaguide_6 -<<<<<<< HEAD -木村です。 -======= - -筑波大学は広いです。 ->>>>>>> 723459c694474c28df0251206a4c5f0fcb8fc20c +筑波大学のいいところ From 8b83b1584d66ee8ab0e2f9e7e84f979cf22a7dd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A2=93=E6=B0=B7=E9=9A=BC=08=E4=B9=9F?= Date: Wed, 17 May 2017 14:26:20 +0900 Subject: [PATCH 10/15] commit --- members.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/members.md b/members.md index 3bab331..0fff813 100644 --- a/members.md +++ b/members.md @@ -10,4 +10,4 @@ 筑波大学は広いです。 >>>>>>> 13586a5c6c3fd5afdfc544b2061404e289081dd8 -碓氷の編集 \ No newline at end of file +碓氷の編集 From 14fe6570e0d1aa60f3889491a74ac34b13beae94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E5=80=89=20=E7=91=A0=E7=B6=AD?= Date: Wed, 17 May 2017 14:28:39 +0900 Subject: [PATCH 11/15] =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=BF=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- members.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/members.md b/members.md index 13960e3..8370efa 100644 --- a/members.md +++ b/members.md @@ -1,3 +1,8 @@ -# tsukubaguide_6 +筑波大生が休日によく行くところ + +・イーアスつくば +ここは映画やショッピングを満喫できるデパートです。 +週末には多くの家族連れの方々でにぎわいます。 + + -筑波大学は広いです。 \ No newline at end of file From 5e5d942a8fcc48d432a2168fb56d6250f7d10859 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B7=9D=E5=A4=A7=E6=B2=B3?= Date: Wed, 17 May 2017 14:47:02 +0900 Subject: [PATCH 12/15] add profiles of saga and watanabe --- members.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/members.md b/members.md index 3640965..d841402 100644 --- a/members.md +++ b/members.md @@ -4,16 +4,4 @@ ここは映画やショッピングを満喫できるデパートです。 週末には多くの家族連れの方々でにぎわいます。 - - -筑波大学のいいところ - -大河です - - -木村です。 - - 筑波大学は広いです。 - -碓氷の編集 From 80e37f360a57c9748097d965495ea74c6779f1cc Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 17 May 2017 14:59:53 +0900 Subject: [PATCH 13/15] aaa --- members.md | 12 +++++++----- tsukubaguide.md | 7 +++++++ 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 tsukubaguide.md diff --git a/members.md b/members.md index d841402..bfdfcb7 100644 --- a/members.md +++ b/members.md @@ -1,7 +1,9 @@ -筑波大生が休日によく行くところ +小川　大河 -・イーアスつくば -ここは映画やショッピングを満喫できるデパートです。 -週末には多くの家族連れの方々でにぎわいます。 +木村　亮介 -筑波大学は広いです。 +大倉　瑠 + +碓氷　隼也 + +平井　宏幸 \ No newline at end of file diff --git a/tsukubaguide.md b/tsukubaguide.md new file mode 100644 index 0000000..8520a16 --- /dev/null +++ b/tsukubaguide.md @@ -0,0 +1,7 @@ +筑波大生が休日によく行くところ + +・イーアスつくば +ここは映画やショッピングを満喫できるデパートです。 +週末には多くの家族連れの方々でにぎわいます。 + +筑波大学は広いです。 \ No newline at end of file From 1c81737bc5d30db18f76cdb50837d13ee831e773 Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 17 May 2017 15:59:59 +0900 Subject: [PATCH 14/15] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=AE=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- members.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/members.md b/members.md index bfdfcb7..333e689 100644 --- a/members.md +++ b/members.md @@ -1,9 +1,9 @@ -小川　大河 +#小川　大河 -木村　亮介 +#木村　亮介 -大倉　瑠 +#rui Ookura -碓氷　隼也 +#碓氷　隼也 -平井　宏幸 \ No newline at end of file +#平井　宏幸 \ No newline at end of file From f48074fafb30405f493159bc88c4e78754450aa0 Mon Sep 17 00:00:00 2001 From: hiro Date: Wed, 17 May 2017 16:02:18 +0900 Subject: [PATCH 15/15] =?UTF-8?q?=E5=A4=89=E6=9B=B4=EF=BC=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- members.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/members.md b/members.md index 333e689..97ce227 100644 --- a/members.md +++ b/members.md @@ -1,9 +1,9 @@ -#小川　大河 +小川　大河 -#木村　亮介 +木村　亮介 -#rui Ookura +rui Ookura -#碓氷　隼也 +碓氷　隼也 -#平井　宏幸 \ No newline at end of file +平井　宏幸 \ No newline at end of file