fixing the merge conflict.

UofT-DSI · Jun 5, 2024 · cfe4e07 · cfe4e07
1 parent 2948178
commit cfe4e07
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 534 deletions.
diff --git a/...bility/a1_sampling_and_reproducibility.md → ...bility/a1_sampling_and_reproducibility.md b/...bility/a1_sampling_and_reproducibility.md → ...bility/a1_sampling_and_reproducibility.md
diff --git a/...ities/assignments/whitby_covid_tracing.py → ...d_reproducibility/whitby_covid_tracing.py b/...ities/assignments/whitby_covid_tracing.py → ...d_reproducibility/whitby_covid_tracing.py
diff --git a/...gnments/a2_questionnaire_design_part_a.md → ...gnments/a2_questionnaire_design_part_a.md b/...gnments/a2_questionnaire_design_part_a.md → ...gnments/a2_questionnaire_design_part_a.md
diff --git a/...gnments/a3_questionnaire_design_part_b.md → ...gnments/a3_questionnaire_design_part_b.md b/...gnments/a3_questionnaire_design_part_b.md → ...gnments/a3_questionnaire_design_part_b.md
diff --git a/...ata_documentation_comparison_worksheet.md → ...ata_documentation_comparison_worksheet.md b/...ata_documentation_comparison_worksheet.md → ...ata_documentation_comparison_worksheet.md
diff --git a/02_activities/assignments/data_documentation_comparison_worksheet.md b/02_activities/assignments/data_documentation_comparison_worksheet.md
diff --git a/...ctivities/assignments/final_assessment.md → ...ents/final_assessment/final_assessment.md b/...ctivities/assignments/final_assessment.md → ...ents/final_assessment/final_assessment.md
diff --git a/...ctivities/assignments/images/picture1.png → ...ents/final_assessment/images/picture1.png b/...ctivities/assignments/images/picture1.png → ...ents/final_assessment/images/picture1.png
diff --git a/...nments/tourangeau_sensitive_questions.pdf → ...ssment/tourangeau_sensitive_questions.pdf b/...nments/tourangeau_sensitive_questions.pdf → ...ssment/tourangeau_sensitive_questions.pdf
diff --git a/02_activities/assignments/questionnaire_design_part_a.md b/02_activities/assignments/questionnaire_design_part_a.md
diff --git a/02_activities/assignments/questionnaire_design_part_b.md b/02_activities/assignments/questionnaire_design_part_b.md
diff --git a/02_activities/assignments/sampling_and_reproducibility.md b/02_activities/assignments/sampling_and_reproducibility.md