diff --git a/README.Rmd b/README.Rmd index 4563f1f..0fbd351 100644 --- a/README.Rmd +++ b/README.Rmd @@ -14,16 +14,9 @@ knitr::opts_chunk$set( ) 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 - +Course collaboration for 202000010 --- diff --git a/README.md b/README.md index 9267cae..f373014 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,5 @@ 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 ----- diff --git a/add_another_text_file.txt b/add_another_text_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/maasvansteenbergen.txt b/maasvansteenbergen.txt new file mode 100644 index 0000000..e69de29