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.

Sign up for GitHub

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 solichatus zahroh #145

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Wk3 solichatus zahroh #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a12375
everything in a single commit
solichatuszhrh Jan 13, 2024
f444d35
conflict resolve
solichatuszhrh Jan 13, 2024
0adf776
solichatus' commit
solichatuszhrh Jan 13, 2024
5c05a7e
Merge branch 'master' into Wk3_SolichatusZahroh
solichatuszhrh Jan 13, 2024
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
12 changes: 5 additions & 7 deletions README.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ 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

<<<<<<< HEAD
Course collaboration for 202000010. Test branch.
=======
Course collaboration for 202000010
>>>>>>> Wk4_markup

---

12 changes: 5 additions & 7 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

# 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
<<<<<<< HEAD
Course collaboration for 202000010. Test branch.
=======
Course collaboration for 202000010
>>>>>>> Wk4_markup

-----
Empty file added SolichatusZahroh.txt
View file
Open in desktop
Empty file.
Empty file added add_another_text_file.txt
View file
Open in desktop
Empty file.