diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-18 05:35:42 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-18 05:35:42 -0500 |
| commit | bdfc09e7ea6ffd7569dd8a671523c5652057884e (patch) | |
| tree | a7eedd9a6095918f2a35427026b4ff1f0833030f /CONTRIBUTORS.txt | |
| parent | 4f47e7cd2fea3f656fd17e6180c6ee30c0753bd2 (diff) | |
| parent | e9a71dfd96bb42791ff97a5e6da5b0c8aa4a606e (diff) | |
| download | pyramid-bdfc09e7ea6ffd7569dd8a671523c5652057884e.tar.gz pyramid-bdfc09e7ea6ffd7569dd8a671523c5652057884e.tar.bz2 pyramid-bdfc09e7ea6ffd7569dd8a671523c5652057884e.zip | |
fix conflicts
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 2654801c3..a449333cb 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -156,3 +156,5 @@ Contributors - Ken Manheimer, 2011/11/07 - Reed O'Brien, 2011/11/07 + +- Klee Dienes, 2011/10/30 |