From 760cf2c1c6b0e5e098528d9229809a46c0a9d24d Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Tue, 13 Dec 2016 12:46:50 -0800 Subject: resolve conflict in CONTRIBUTORS.txt --- CONTRIBUTORS.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CONTRIBUTORS.txt') diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index dcca62d48..93e526830 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -285,4 +285,8 @@ Contributors - Keith Yang, 2016/07/22 -- Hannah Krager, 2016/10/22 \ No newline at end of file +- Hannah Krager, 2016/10/22 + +- Moriyoshi Koizumi, 2016/11/20 + +- Mikko Ohtamaa, 2016/12/6 -- cgit v1.2.3