diff options
| author | Chris McDonough <chrism@plope.com> | 2012-09-17 01:25:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-09-17 01:25:51 -0400 |
| commit | 2d6a0e3a9d1699d033f45e52bac38589b1f7c054 (patch) | |
| tree | 085a46e20ce4ca2bd257c8215b95df21a944aa36 /CONTRIBUTORS.txt | |
| parent | db2a03786ec76f2c6b7eaebb6f1b7c8b844d8c82 (diff) | |
| parent | aa9d3bf71765342852e688aca34d04e07707263c (diff) | |
| download | pyramid-2d6a0e3a9d1699d033f45e52bac38589b1f7c054.tar.gz pyramid-2d6a0e3a9d1699d033f45e52bac38589b1f7c054.tar.bz2 pyramid-2d6a0e3a9d1699d033f45e52bac38589b1f7c054.zip | |
resolve contributors.txt merge conflict
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index e2a6ec018..d03da3e62 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 @@ -187,3 +187,4 @@ Contributors - Domen Kozar, 2012/09/11 +- David Gay, 2012/09/16 |