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 laurajochim #158

Open
wants to merge 3 commits into
base: Exercise_wk4
Choose a base branch
from
Open

Wk3 laurajochim #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe60b13
everything in a single commit
laurajochim Jan 7, 2025
4f18be7
Merge branch 'Wk4_markup' into Exercise_wk4
laurajochim Jan 7, 2025
2a532bf
this is a commit by laura
laurajochim Jan 7, 2025
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
4 changes: 4 additions & 0 deletions README.Rmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +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>

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

---

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

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

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

-----
2 changes: 2 additions & 0 deletions add_another_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PID PPID PGID WINPID TTY UID STIME COMMAND
27764 1 27764 27764 con 500 15:06:51 /usr/msys-ssh-1000-18/ps
2 changes: 2 additions & 0 deletions laurajochim.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PID PPID PGID WINPID TTY UID STIME COMMAND
28808 1 28808 28808 con 500 15:02:48 /usr/msys-ssh-1000-18/ps