RHUL-CS-Projects / compsci-superbasics

GitHub-pages hosted minisite with helpful superbasic info for students in CompSci labs (Foundation and CS1811/22)
https://rhul-cs-projects.github.io/compsci-superbasics/
MIT License
0 stars 3 forks source link

add Hardware section (from upstream repo) #12

Closed davewhiteland closed 2 years ago

davewhiteland commented 2 years ago

This is the a merge from the upstream repo with two conflicts resolved: one on tab-completion because the upstream hasn't got the typo fix RHUL has (yet; I'll fix that), the other because the about page doesn't link to Beholder or the upstream repo (this is fine).

Also need to remove the CNAME from upstream merges because it maps to the beholder domain there (i.e., this is a routine and expected fix on PRs here on the RHUL fork).

Conflicts resolved in this repo locally (on branch davewhiteland-main) and then merged as a PR on the RHUL_CS_Projects org github. (Probably would have been simpler to do it in the GitHub UI, heh).