Adrian Schröter 2017-08-21 14:54:18 +00:00 committed by Git OBS Bridge
parent 2c774f886c
commit 7cdb5809da

View File

@ -23,13 +23,8 @@ Url: http://github.com/openSUSE/product-builder
Name: product-builder Name: product-builder
Conflicts: kiwi Conflicts: kiwi
Conflicts: kiwi-instsource Conflicts: kiwi-instsource
<<<<<<< ./product-builder.spec.mine
Version: 1.0~pre.1503326741.f9c347a Version: 1.0~pre.1503326741.f9c347a
Release: 0 Release: 0
=======
Version: 1.0~pre.1503326741.f9c347a
Release: 0
>>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c
Provides: kiwi-schema = 6.2 Provides: kiwi-schema = 6.2
Source: product-builder-%version.tar.xz Source: product-builder-%version.tar.xz