From 4c675668ce86b138896bb09b09fc3aea04d51505 Mon Sep 17 00:00:00 2001 From: mobuhiko Date: Tue, 21 Jul 2020 20:46:37 +0900 Subject: [PATCH 1/5] fix 101 --- readme.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme.txt b/readme.txt index 7e4289f..d427473 100644 --- a/readme.txt +++ b/readme.txt @@ -3,3 +3,5 @@ hijklmmmmnnnn opqrst master dev + +fix 101: FIX \ No newline at end of file From cbeb25987e81b853428ac5fefa57af69176f164c Mon Sep 17 00:00:00 2001 From: mobuhiko Date: Tue, 21 Jul 2020 20:53:26 +0900 Subject: [PATCH 2/5] solve conflict with stash --- readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index d427473..7bd5970 100644 --- a/readme.txt +++ b/readme.txt @@ -4,4 +4,5 @@ opqrst master dev -fix 101: FIX \ No newline at end of file +fix 101: FIX +dev: hello From 4853eae0df5eb8c09eee9d235af2cdcce6b22d2e Mon Sep 17 00:00:00 2001 From: mobuhiko Date: Tue, 21 Jul 2020 21:00:21 +0900 Subject: [PATCH 3/5] add hello.py --- hello.py | 1 + 1 file changed, 1 insertion(+) create mode 100644 hello.py diff --git a/hello.py b/hello.py new file mode 100644 index 0000000..7027fce --- /dev/null +++ b/hello.py @@ -0,0 +1 @@ +// hello \ No newline at end of file From d346ddeb24b1e08b9b920e2fdc6a5eda5134fe7a Mon Sep 17 00:00:00 2001 From: mobuhiko Date: Tue, 21 Jul 2020 21:41:53 +0900 Subject: [PATCH 4/5] add env.txt --- env.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 env.txt diff --git a/env.txt b/env.txt new file mode 100644 index 0000000..2b204ed --- /dev/null +++ b/env.txt @@ -0,0 +1 @@ +env from second \ No newline at end of file From 6455fc9f5abb1a8dce19a86d612d5d81edfffb45 Mon Sep 17 00:00:00 2001 From: mobuhiko Date: Tue, 21 Jul 2020 21:48:40 +0900 Subject: [PATCH 5/5] dev: add env.txt --- env.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 env.txt diff --git a/env.txt b/env.txt new file mode 100644 index 0000000..da54d26 --- /dev/null +++ b/env.txt @@ -0,0 +1 @@ +env from first dev \ No newline at end of file