diff options
| author | Steve Piercy <web@stevepiercy.com> | 2016-12-13 12:46:50 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2016-12-13 12:46:50 -0800 |
| commit | 760cf2c1c6b0e5e098528d9229809a46c0a9d24d (patch) | |
| tree | 579833c14c7f9b923fd07e6c1709e59dddac108e /CONTRIBUTORS.txt | |
| parent | b7b18463b80b9f16d603264c3b1b661061f492e6 (diff) | |
| download | pyramid-760cf2c1c6b0e5e098528d9229809a46c0a9d24d.tar.gz pyramid-760cf2c1c6b0e5e098528d9229809a46c0a9d24d.tar.bz2 pyramid-760cf2c1c6b0e5e098528d9229809a46c0a9d24d.zip | |
resolve conflict in CONTRIBUTORS.txt
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 6 |
1 files changed, 5 insertions, 1 deletions
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 |