From 69c6d857549a6aa46bb374baed82914a91836c46 Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Mon, 11 Aug 2025 15:22:17 +0200 Subject: [PATCH] resolve merge artifacts --- systems/x86_64-linux/manwe/README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/systems/x86_64-linux/manwe/README.md b/systems/x86_64-linux/manwe/README.md index 3bb6746..1da7ab1 100644 --- a/systems/x86_64-linux/manwe/README.md +++ b/systems/x86_64-linux/manwe/README.md @@ -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