diff options
| author | Chris McDonough <chrism@plope.com> | 2011-04-18 00:57:22 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-04-18 00:57:22 -0400 |
| commit | 5ae903df461d7174f0a8bb590511607c8a054d98 (patch) | |
| tree | f40bd8938ca8a98bd3b000bdacc72d9f365a71c3 /CONTRIBUTORS.txt | |
| parent | d0eb2c06387db8a7ac27cb1292adea26aab11253 (diff) | |
| parent | ef4b4fdde88903ceaa9920a8f0ff41fcfe380e02 (diff) | |
| download | pyramid-5ae903df461d7174f0a8bb590511607c8a054d98.tar.gz pyramid-5ae903df461d7174f0a8bb590511607c8a054d98.tar.bz2 pyramid-5ae903df461d7174f0a8bb590511607c8a054d98.zip | |
fix 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 818a1af98..5a72f242e 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -131,5 +131,7 @@ Contributors - Malthe Borch, 2011/02/28 +- Joel Bohman, 2011/04/16 + - Juliusz Gonera, 2011/04/17 |