From 2a11f7b9da7cdd2a29f9a0121179dd6f08ca5565 Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 11:26:56 +0900 Subject: [PATCH 1/6] add:my nane --- mynane.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 mynane.txt diff --git a/mynane.txt b/mynane.txt new file mode 100644 index 0000000..6724185 --- /dev/null +++ b/mynane.txt @@ -0,0 +1 @@ +Morikawa Yamato \ No newline at end of file From 9e35a90cd8eccdb50117a8e3080698730587ce22 Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 13:35:13 +0900 Subject: [PATCH 2/6] Hello World --- ex1.cpp | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 ex1.cpp diff --git a/ex1.cpp b/ex1.cpp new file mode 100644 index 0000000..4705404 --- /dev/null +++ b/ex1.cpp @@ -0,0 +1,7 @@ +#include + +int main(void) +{ + printf("Hello World"); + return 0; +} \ No newline at end of file From d9cf47efbc5f8bffb77e7e66f6e7d66bfc8a742e Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 14:18:40 +0900 Subject: [PATCH 3/6] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ex1.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ex1.cpp b/ex1.cpp index e6221a1..b927886 100644 --- a/ex1.cpp +++ b/ex1.cpp @@ -1,12 +1,3 @@ -<<<<<<< HEAD -#include - -int main(void) -{ - printf("Hello World"); - return 0; -} -======= #include int main(){ @@ -14,4 +5,3 @@ int main(void) return 0; } ->>>>>>> upstream/master From c8f381aefd33dbeacb567c34a703fb226d9e4d98 Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 14:20:48 +0900 Subject: [PATCH 4/6] =?UTF-8?q?=E3=81=95=E3=82=89=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ex1.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ex1.cpp b/ex1.cpp index b927886..054a4f1 100644 --- a/ex1.cpp +++ b/ex1.cpp @@ -2,6 +2,8 @@ int main(){ printf("hello world"); + int x=1; + printf("%d",x); return 0; } From 014e2b1b9e769f4a2071c8c4fd39d1f8f61a8b6d Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 14:26:53 +0900 Subject: [PATCH 5/6] updeat hoge --- ex1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ex1.cpp b/ex1.cpp index 054a4f1..4b8a8d6 100644 --- a/ex1.cpp +++ b/ex1.cpp @@ -4,6 +4,6 @@ printf("hello world"); int x=1; printf("%d",x); - + puts("hogehoge") return 0; } From ced9e078bc2e0a9c240113da681ec7bb3a1335c6 Mon Sep 17 00:00:00 2001 From: morikawayamato Date: Thu, 26 Dec 2019 14:35:07 +0900 Subject: [PATCH 6/6] aaa --- ex1.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ex1.cpp b/ex1.cpp index e6221a1..b927886 100644 --- a/ex1.cpp +++ b/ex1.cpp @@ -1,12 +1,3 @@ -<<<<<<< HEAD -#include - -int main(void) -{ - printf("Hello World"); - return 0; -} -======= #include int main(){ @@ -14,4 +5,3 @@ int main(void) return 0; } ->>>>>>> upstream/master