OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=662

2018-06-07 09:58:26 +00:00 · 2018-06-07 09:58:26 +00:00 · 65c3add477
commit 65c3add477
parent 67cf8aafbd
1 changed files with 0 additions and 7 deletions
--- 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)