fix
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/product-builder?expand=0&rev=30
This commit is contained in:
parent
5abd6042fd
commit
cb17c603cb
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f91c90d39a1006a0f8e62836767d3009fba74d52825f03d2d0e50765d1bf9244
|
||||
size 1305612
|
3
product-builder-1.0~pre.1503323743.11ee104.obscpio
Normal file
3
product-builder-1.0~pre.1503323743.11ee104.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5ee9e881e276dbf4dac0a16deb4ce908e1743da1c5dd3049dd67bb52e939bc97
|
||||
size 1305612
|
@ -1,5 +1,5 @@
|
||||
name: product-builder
|
||||
version: 1.0~pre.1503317859.14d1a13
|
||||
mtime: 1503317859
|
||||
commit: 14d1a13c01c20638af4d6066788f592363fcc6d7
|
||||
version: 1.0~pre.1503323743.11ee104
|
||||
mtime: 1503323743
|
||||
commit: 11ee1048c7dd18d6827bb8792be2da89a82f0860
|
||||
|
||||
|
@ -24,10 +24,10 @@ Name: product-builder
|
||||
Conflicts: kiwi
|
||||
Conflicts: kiwi-instsource
|
||||
<<<<<<< ./product-builder.spec.mine
|
||||
Version: 1.0~pre.1503317859.14d1a13
|
||||
Version: 1.0~pre.1503323743.11ee104
|
||||
Release: 0
|
||||
=======
|
||||
Version: 1.0~pre.1503317859.14d1a13
|
||||
Version: 1.0~pre.1503323743.11ee104
|
||||
Release: 0
|
||||
>>>>>>> ./product-builder.spec.r0ff8f0de04c2f43d9df4f23d686c1e9c
|
||||
Provides: kiwi-schema = 6.2
|
||||
|
Loading…
Reference in New Issue
Block a user