Closed tracykteal closed 6 years ago
Darn merge conflicts. I can work to resolve, but @hoytpr @lmichael107 does this generally look OK?
@tracykteal https://github.com/datacarpentry/spreadsheet-ecology-lesson/blob/gh-pages/data/survey_sorting_exercise.xlsx?raw=true) Points to the lesson data folder? So survey_sorting_exercise.xlsx should be in that folder, but it's not?
@tracykteal The original file is at: https://github.com/datacarpentry/spreadsheet-ecology-lesson/blob/sorting-data/data/survey_sorting_exercise.xlsx?raw=true But I don't see the "sorting-data" folder (although it must exist)
It exists in your sorting-data-branch. Merge that first.
looks good to me, aside from the conflict
@tracykteal @lmichael107 The original link was to "survey_sorting_exercise.xls" maybe the .xlsx is causing conflict? Otherwise LPG.
Adds the spreadsheet for the exercise in 04-quality-control module. Addresses https://github.com/datacarpentry/spreadsheet-ecology-lesson/issues/220