From 8809ccd03601e3036be462880eab208c6b3dc4fefacf089dc598301e04937807 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@gmail.com>
Date: Fri, 8 Mar 2024 16:40:13 +0000
Subject: [PATCH] Accepting request 1156296 from
 home:favogt:branches:Virtualization

Remove conflict markers

OBS-URL: https://build.opensuse.org/request/show/1156296
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=726
---
 virtualbox.changes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/virtualbox.changes b/virtualbox.changes
index beb03de..3802898 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -41,13 +41,11 @@ This is a maintenance release. The following items were fixed and/or added:
     RDP: Fix possible crash when connecting with the Apple Silicon variant of the Microsoft Remote Desktop application (bug #21820).
     BIOS: Fixed handle number used for DMI OEM table (bug #19781) 
 
-=======
 -------------------------------------------------------------------
 Thu Oct 26 18:10:45 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
 
 - Update file "fixes_for_leap.patch" to cover API change in Leap 15.6 kernel.
 
->>>>>>> ./virtualbox.changes.new
 -------------------------------------------------------------------
 Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>