diff options
| author | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:22:39 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2017-05-12 21:22:39 -0700 |
| commit | b5444950d84c507f26764a16021db6e01d0461e3 (patch) | |
| tree | 6d0a62b5e34f5c32d29d32525e23bb73e3882714 /CONTRIBUTORS.txt | |
| parent | b57460e673b4837f9bb587ecb9b6deb1761dcfe6 (diff) | |
| download | pyramid-b5444950d84c507f26764a16021db6e01d0461e3.tar.gz pyramid-b5444950d84c507f26764a16021db6e01d0461e3.tar.bz2 pyramid-b5444950d84c507f26764a16021db6e01d0461e3.zip | |
resolve conflicts
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 4 |
1 files changed, 3 insertions, 1 deletions
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 |