Commit 9df29d0f authored by kberry's avatar kberry
Browse files

Resolved merge conflict

parent 558e71b8
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Development Team
* Kristin Berry <kberry@usgs.gov>
* Jeannie Backer <jwbacker@usgs.gov>
* Dyer Lytle <dmlytle@usgs.gov>
* Jeannie Backer <jwbacker@usgs.gov>

Contributors
------------