diff options
| author | Chris McDonough <chrism@plope.com> | 2011-11-07 12:30:55 -0800 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-11-07 12:30:55 -0800 |
| commit | 512982bc876cbab7dc0671c1e807f57d64bf718b (patch) | |
| tree | 62845b570b993c5fab3d2604d0ed8198d76eae35 /CONTRIBUTORS.txt | |
| parent | b9eac7ede70525b04bc0cf5341e258b92a2edb96 (diff) | |
| parent | 2723b03b611de3512f46c09f8c53ec324cdee7fc (diff) | |
| download | pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.tar.gz pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.tar.bz2 pyramid-512982bc876cbab7dc0671c1e807f57d64bf718b.zip | |
resolve conflict
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 23f3cd6ee..4ac88fc15 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -1,4 +1,4 @@ -Pylons Project Contributor Agreement + Pylons Project Contributor Agreement ==================================== The submitter agrees by adding his or her name within the section below named @@ -150,3 +150,5 @@ Contributors - Manuel Hermann, 2011/07/11 - Chris Shenton, 2011/11/07 + +- Ken Manheimer, 2011/11/07 |