Project 'hifis/software/education/hifis-workshops/introduction-to-git-and-gitlab/workshop-material' was moved to 'hifis/software/education/hifis-workshops/git-and-gitlab-courses/workshop-material'. Please update any links and bookmarks that may still have the old path.

Commit 734358e2 authored 4 years ago by Tobias Schlauch

Merge branch '1-rework-episode-9-conflicts' into 'master'

Resolve "Rework episode 9 (conflicts)"

Closes #1

See merge request hifis/hifis-workshops/introduction-to-git-and-gitlab/workshop-material!1

parents 898b719b dd22c903

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 128 additions and 4 deletions

Please register or to comment