From 134267e6806bd0b9cbacae54d763b73c7f65fa85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Sat, 30 May 2020 11:49:37 +0200
Subject: [PATCH] [nxd] fix merge conflict

---
 manjaro/nxd/Packages-Desktop | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/manjaro/nxd/Packages-Desktop b/manjaro/nxd/Packages-Desktop
index 4545012..63c6057 100644
--- a/manjaro/nxd/Packages-Desktop
+++ b/manjaro/nxd/Packages-Desktop
@@ -92,12 +92,7 @@ terminus-font
 
 ## Package management
 #appimagelauncher
-<<<<<<< HEAD
-pamac
-=======
-bauh
 pamac-gtk
->>>>>>> ce5f3cd... [prepare] 20.0.2
 pamac-tray-appindicator
 pamac-cli
 >extra apparmor