diff options
Diffstat (limited to 'CONTRIBUTORS.txt')
| -rw-r--r-- | CONTRIBUTORS.txt | 1 |
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 |