Permalink
Browse files

fix merge conflict

  • Loading branch information...
2 parents 0ccdc23 + edab820 commit c59570727a1555c9f1f493d6db8e973f09ab0883 @mcdonc mcdonc committed Nov 19, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 CONTRIBUTORS.txt
View
@@ -190,3 +190,5 @@ Contributors
- David Gay, 2012/09/16
- Robert Jackiewicz, 2012/11/12
+
+- John Anderson, 2012/11/14

0 comments on commit c595707

Please sign in to comment.