diff --git a/README.Rmd b/README.Rmd index 4563f1f..7729d82 100644 --- a/README.Rmd +++ b/README.Rmd @@ -17,13 +17,8 @@ options(width = 60, digits = 3) # markup 2020 - -Course collaboration for 202000010. - -You need to solve this conflict in a generic manner such that your classmates can also merge their forked branch into this master branch. So think about a solution on your end. - -Gerko - +Wk3_kirstenvankessel +Course collaboration for 202000010 --- diff --git a/README.md b/README.md index 9267cae..a6a7b13 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,7 @@ # markup 2020 -Course collaboration for 202000010. - -You need to solve this conflict in a generic manner such that your -classmates can also merge their forked branch into this master branch. -So think about a solution on your end. - -Gerko +Wk3_kirstenvankessel +Course collaboration for 202000010 ----- diff --git a/add_another_text_file.txt b/add_another_text_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/kirstenvankessel.txt b/kirstenvankessel.txt new file mode 100644 index 0000000..e69de29