From 7954ef729dade2042fa2da3c77c302de49cf48215a1649c715b413a0069a8a6b Mon Sep 17 00:00:00 2001
From: Johannes Segitz <jsegitz@suse.com>
Date: Thu, 29 Sep 2022 15:53:47 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/security:SELinux/selinux-policy?expand=0&rev=149

---
 selinux-policy.changes | 1 -
 1 file changed, 1 deletion(-)

diff --git a/selinux-policy.changes b/selinux-policy.changes
index 39dc891..671e11c 100644
--- a/selinux-policy.changes
+++ b/selinux-policy.changes
@@ -13,7 +13,6 @@ Tue Sep 27 13:00:35 UTC 2022 - Filippo Bonazzi <filippo.bonazzi@suse.com>
 - Update fix_xserver.patch to add greetd support (bsc#1198559)
 
 -------------------------------------------------------------------
->>>>>>> ./selinux-policy.changes.new
 Mon Sep 12 06:47:56 UTC 2022 - Johannes Segitz <jsegitz@suse.com>
 
 - Revamped rtorrent module