diff --git a/README.Rmd b/README.Rmd index 4563f1f..e69de29 100644 --- a/README.Rmd +++ b/README.Rmd @@ -1,29 +0,0 @@ ---- -output: - md_document: - variant: gfm ---- - - - -```{r, echo = FALSE} -knitr::opts_chunk$set( - collapse = TRUE, - comment = "#>", - fig.path = "README-" -) -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 - - ---- - diff --git a/README.md b/README.md index 9267cae..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,13 +0,0 @@ - - -# 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 - ------ diff --git a/add_another_text_file.txt b/add_another_text_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/martijn.txt b/martijn.txt new file mode 100644 index 0000000..e69de29