From 30d6f67c98d149508509d5e86f176d558793acc0 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 14 Oct 2019 22:43:21 +0100
Subject: fix merge issue

---
 profiles/package.mask | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'profiles/package.mask')

diff --git a/profiles/package.mask b/profiles/package.mask
index 72798308a697..c191e08ea922 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,8 +29,6 @@
 
 #--- END OF EXAMPLES ---
 
-<<<<<<< HEAD
-=======
 # Stefan Strogin <steils@gentoo.org> (2019-09-27)
 # Requires >=dev-lang/lua-5.3 which is masked
 >=dev-util/bam-0.5.0
@@ -46,7 +44,6 @@ virtual/python-pmw
 # Blocks its own dependency. Bug #695606.
 =x11-libs/libXvMC-1.0.12
 
->>>>>>> next
 # Joonas Niilola <juippis@gentoo.org> (2019-09-24)
 # Upstream decided to deprecate this service, and app. Removal in 
 # ~30 days. Bug #695562
-- 
cgit v1.2.3