From b5444950d84c507f26764a16021db6e01d0461e3 Mon Sep 17 00:00:00 2001 From: Steve Piercy Date: Fri, 12 May 2017 21:22:39 -0700 Subject: resolve conflicts --- CONTRIBUTORS.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'CONTRIBUTORS.txt') diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1a6fc24ac..542b85f8e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -295,4 +295,6 @@ Contributors - Kirill Kuzminykh, 2017/03/01 -- Aleph Melo, 2017/04/16 \ No newline at end of file +- Aleph Melo, 2017/04/16 + +- Jeremy(Ching-Rui) Chen, 2017/04/19 -- cgit v1.2.3