From 1fc49df045a89b1c0c119e83a114c376c61d7a7b Mon Sep 17 00:00:00 2001
From: simono41 <simono41>
Date: Thu, 3 May 2018 17:10:06 +0200
Subject: [PATCH] HEAD

---
 packages_manjaro.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages_manjaro.txt b/packages_manjaro.txt
index 6d52cb0..71ba38f 100644
--- a/packages_manjaro.txt
+++ b/packages_manjaro.txt
@@ -686,12 +686,9 @@ nfs-utils
 nfsidmap
 nilfs-utils
 nm-connection-editor
-<<<<<<< HEAD
 noto-fonts
 noto-fonts-emoji
-=======
 nmap
->>>>>>> 2b2c2fcfcf1a3693e8a601267b5a948f94001fae
 npth
 nspr
 nss