From 65c3add477e518ef9f99d7855276d08f0229ff514a79f6f0f27597cbcb7986e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 7 Jun 2018 09:58:26 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=662

---
 libreoffice.spec | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 6d7c8b6..668ea8f 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -912,13 +912,6 @@ Provides additional %{langname} translations and resources for %{project}. \
 %patch3
 %patch4 -p1
 %patch5 -p1
-<<<<<<< ./libreoffice.spec.mine
-=======
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
->>>>>>> ./libreoffice.spec.r39e201c4a7e11cf1b55d4dcd6e9ae3d2
 %patch990 -p1
 
 # Disable some of the failing tests (some are random)