summaryrefslogtreecommitdiff
path: root/CONTRIBUTORS.txt
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-11-04 13:43:39 -0600
committerMichael Merickel <michael@merickel.org>2018-11-04 16:22:04 -0600
commitebb56ebe4dd0cbecd6d19b5741ddf52c96a0176d (patch)
treee3106d2bcf13778d553ccf1f2630e6a9db8cafd2 /CONTRIBUTORS.txt
parent44e7e63ac1f95d52bdd25c22c36efd820c059e35 (diff)
downloadpyramid-ebb56ebe4dd0cbecd6d19b5741ddf52c96a0176d.tar.gz
pyramid-ebb56ebe4dd0cbecd6d19b5741ddf52c96a0176d.tar.bz2
pyramid-ebb56ebe4dd0cbecd6d19b5741ddf52c96a0176d.zip
add changelog for #3414
Diffstat (limited to 'CONTRIBUTORS.txt')
-rw-r--r--CONTRIBUTORS.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 6eb42c18c..79e4287d2 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -230,7 +230,6 @@ Contributors
- Antti Haapala, 2013/11/15
- Amit Mane, 2014/01/23
-<<<<<<< HEAD
- Fenton Travers, 2014/05/06