fix past remnants of merge conflicts in data_formatting_table

hurlbertlab / core-transient

Data and code for NSF funded research on core vs transient species

7 stars 3 forks source link

fix past remnants of merge conflicts in data_formatting_table #81

Closed ahhurlbert closed 8 years ago

ahhurlbert commented 8 years ago

This is a reminder to myself to take care of this.

ahhurlbert commented 8 years ago

Fixed. One reason we hadn't realized there were merge conflicts is because of returns within multiline comments posted to the data formatting table from the R cleaning scripts.

We are now making sure that all multiline comments have no hard line endings in them, which means the merge conflict hashes will actually show up at the start of a line when opened in a spreadsheet, rather than being buried in a cell.