merging DB's branch with conflicts

USGS-R / protoloads

Prototyping and exploring options for broad-scale load forecasting

0 stars 4 forks source link

merging DB's branch with conflicts #19

Closed aappling-usgs closed 6 years ago

aappling-usgs commented 6 years ago

more or less following the directions provided by github, except they would have had me pushing straight from my local repo to the USGS-R repo, and instead i pushed to aappling-usgs and am PRing from there