Commit 264cf71a authored by kberry's avatar kberry
Browse files

Resolved merge conflict

parent 9d9fca6a

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ notifications: 
            - jlaura@usgs.gov

            - kberry@usgs.gov

            - dmlytle@usgs.gov

            - jwbacker@usgs.gov

        on_success: always

        on_failure: always

AUTHORS.rst

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Development Team 
* Jay Laura <jlaura@usgs.gov>

* Kristin Berry <kberry@usgs.gov>

* Dyer Lytle <dmlytle@usgs.gov>

* Jeannie Backer <jwbacker@usgs.gov>



Contributors

------------