maride/hugo-theme-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Chris Roberts 2019-11-03 15:06:28 +00:00
parent 3f21c20750
commit 518f03c4fb
No known key found for this signature in database
GPG Key ID: 97F2481A77CBF43E
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
USERS.md
View File

@ -15,10 +15,13 @@
- https://zaine.me **Amine Zaine** (Cloud Engineer)
- https://notes.dmaitre.phyip3.dur.ac.uk/computing-club/ **Ryan Moodie** (Physics PhD student)
- https://thecodecousins.com **Stanley Nguyen** (Software Engineer) & **Hoang Do** (Software & IoT Engineer)
<<<<<<< HEAD
- https://naxxfish.net **Chris Roberts** (Broadcast Systems Engineer)
- https://schacherbauer.dev **Markus Schacherbauer** (Student Developer)
- https://rinma.dev **Marvin Dalheimer** (Software Developer)
- https://lunar.computer **Lunar Computer** (DevOps Engineer)
=======
>>>>>>> parent of 2438bb4... added Chris Roberts to users
<!--
TEMPLATE: