diff options
| author | Chris McDonough <chrism@plope.com> | 2012-11-18 21:50:07 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-11-18 21:50:07 -0500 |
| commit | c59570727a1555c9f1f493d6db8e973f09ab0883 (patch) | |
| tree | 3b4b206aca9d9bf74ad4949fe218d760b8813bdf | |
| parent | 0ccdc23f6ec53548bb1f81f3b528f2a8be0a5467 (diff) | |
| parent | edab820875af1670fc298bc174e824d7b2de8f81 (diff) | |
| download | pyramid-c59570727a1555c9f1f493d6db8e973f09ab0883.tar.gz pyramid-c59570727a1555c9f1f493d6db8e973f09ab0883.tar.bz2 pyramid-c59570727a1555c9f1f493d6db8e973f09ab0883.zip | |
fix merge conflict
| -rw-r--r-- | CONTRIBUTORS.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 34d904d0f..971c172f8 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -190,3 +190,5 @@ Contributors - David Gay, 2012/09/16 - Robert Jackiewicz, 2012/11/12 + +- John Anderson, 2012/11/14 |