Merge branch 'feature/migrate-to-snowfall' of https://github.com/chris-kruining/sneeuwvlok into feature/migrate-to-snowfall
This commit is contained in:
commit
963d52399e
2 changed files with 26 additions and 1 deletions
|
@ -1,3 +1,8 @@
|
|||
# Description
|
||||
|
||||
<<<<<<< HEAD
|
||||
My steambox.
|
||||
=======
|
||||
My desktop, reasoning for the name being the following chain of thought:
|
||||
**Manwe -> the king of the valar -> leader -> desktop is main machine**
|
||||
>>>>>>> 72b0f6f8fad97a4ade1b54dfada26828a170febf
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue