search

Chicago / predicting-e-coli-concentrations

This repository is part of the working draft for an upcoming an academic paper describing the methods and results of the City of Chicago Clear Water project.
2 stars 0 forks source link

Resolves #75 #76

Closed nicklucius closed 6 years ago

nicklucius commented 6 years ago

@tomschenkjr - I'm not sure how GitHub is going to handle this, given the issues in #75.

nicklucius commented 6 years ago

@tomschenkjr - it looks like GitHub is taking the entire change to zotero-references.bib as a merge conflict and is still not registering the change to predicting-e-coli-concentrations.Rmd. I can handle the merge conflict and merge this, which should fix the issue.

nicklucius commented 6 years ago

That should do it.