diff --git a/README.Rmd b/README.Rmd index 4563f1f..872da14 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,12 +18,11 @@ options(width = 60, digits = 3) # markup 2020 +Course collaboration for 202000010 + 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..c309536 100644 --- a/README.md +++ b/README.md @@ -1,13 +1 @@ - - -# 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 \ No newline at end of file diff --git a/add_another_text_file.txt b/add_another_text_file.txt new file mode 100644 index 0000000..e69de29 diff --git a/add_text_file.txt b/add_text_file.txt new file mode 100644 index 0000000..e69de29