Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wk3 kirstenvankessel #135

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,8 @@ options(width = 60, digits = 3)

# markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>


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

---

9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@

# markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>

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

-----
Empty file added add_another_text_file.txt
Empty file.
Empty file added kirstenvankessel.txt
Empty file.