diff options
| author | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-10-02 16:09:57 -0400 |
| commit | 9c3c9a8075f250122d7827a71b6217213180fe70 (patch) | |
| tree | 39ebca0f2dbdd352a1d94d17c33acbb61a02393a /CONTRIBUTORS.txt | |
| parent | af5fa07ca2fcc48ab357c0db4e1301bb960addca (diff) | |
| parent | a2d4c260952a8e2329df0c4a66d7239f2e8d0652 (diff) | |
| download | pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.gz pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.tar.bz2 pyramid-9c3c9a8075f250122d7827a71b6217213180fe70.zip | |
fix merge conflict
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1a5b975d7..bfe22e540 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -222,3 +222,5 @@ Contributors - Takahiro Fujiwara, 2013/08/28 - Doug Hellmann, 2013/09/06 + +- Karl O. Pinc, 2013/09/27 |