From 7cdb5809da3c3ecd27da1f3a618845b3125c0deeed8dca27301eb61c7f632c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 21 Aug 2017 14:54:18 +0000 Subject: [PATCH] fix OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=32 --- product-builder.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/product-builder.spec b/product-builder.spec index 1f23571..0a802c9 100644 --- a/product-builder.spec +++ b/product-builder.spec @@ -23,13 +23,8 @@ Url: http://github.com/openSUSE/product-builder Name: product-builder Conflicts: kiwi Conflicts: kiwi-instsource -<<<<<<< ./product-builder.spec.mine Version: 1.0~pre.1503326741.f9c347a Release: 0 -======= -Version: 1.0~pre.1503326741.f9c347a -Release: 0 ->>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c Provides: kiwi-schema = 6.2 Source: product-builder-%version.tar.xz