search

MolSSI-Education / QM_2017_SSS_Team3

BSD 3-Clause "New" or "Revised" License
0 stars 5 forks source link

Git merge text #44

Closed dgasmith closed 7 years ago

dgasmith commented 7 years ago

Looks like you missed all of the git merge text in a few places.

gevahn commented 7 years ago

The link leads to a different team?

shannonhouck commented 7 years ago

Yup, I see it! I'll go ahead and fix it. Thanks!

shannonhouck commented 7 years ago

So I've found and resolved the issue in scf/init.py, but I couldn't seem to find any other instances. Let me know if you all see anything I've missed.

dgasmith commented 7 years ago

Aha! That was it. Apologies, looks like I copied in the wrong line.

shannonhouck commented 7 years ago

Ok, perfect. Thanks for letting us know!