chris/sneeuwvlok
chris/sneeuwvlok
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge artifacts

Browse source
This commit is contained in:
Chris Kruining 2025-08-11 15:22:17 +02:00
parent de1bc287d5
commit 69c6d85754
No known key found for this signature in database
GPG key ID: EB894A3560CCCAD2
1 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
systems/x86_64-linux/manwe/README.md
View file

@ -1,8 +1,3 @@
# 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