fixed reference to HSP2tools in cell 15

respec / HSPsquared

Hydrologic Simulation Program Python (HSPsquared)

GNU Affero General Public License v3.0

43 stars 17 forks source link

fixed reference to HSP2tools in cell 15 #7

Closed ethankale closed 6 years ago

ethankale commented 6 years ago

Fixes #6.

crpAnderson commented 6 years ago

I'm surprised that it won't let us resolve the merge conflict in the browser since it seems like it is in a file that you only changed two lines in, do you need any help sorting it out via the command line?

crpAnderson commented 6 years ago

If you're a commit behind and unable to pull the change in locally you might need to run git branch --set-upstream to track the changes on the remote branch to be able to pull those changed locally. Then push your updated feature branch back up and the merge conflict should go away. Also would you please change the branch the pull is against from master to the new contribute branch?