From 25598ea17902c1057fb1685068dbadd229b31272 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Oct 17 2019 08:52:42 +0000
Subject: Update to version 0.7.15


Signed-off-by: Clement Verna <cverna@tutanota.com>

---

diff --git a/.gitignore b/.gitignore
index 5cba2e5..bf671df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /koji-containerbuild-49e2b53033d4086a030d4a471dd034b8134d1253.tar.gz
 /koji-containerbuild-f91348b0a60ef01d75ea3c3bd927a5231f256398.tar.gz
 /koji-containerbuild-b6dcb6555e20e7abd50488f76eb14588ebdf6301.tar.gz
+/koji-containerbuild-dab7501bd461e4ce85c5238f62cb353b3c6e8189.tar.gz
diff --git a/koji-containerbuild.spec b/koji-containerbuild.spec
index d330508..9e2082b 100644
--- a/koji-containerbuild.spec
+++ b/koji-containerbuild.spec
@@ -14,12 +14,17 @@
 %global owner release-engineering
 %global project koji-containerbuild
 
-%global commit b6dcb6555e20e7abd50488f76eb14588ebdf6301
+%global commit dab7501bd461e4ce85c5238f62cb353b3c6e8189
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name:           %{project}
+<<<<<<< HEAD
 Version:        0.7.13.1
 Release:        3%{?dist}
+=======
+Version:        0.7.15
+Release:        1%{?dist}
+>>>>>>> ad6e532... Update to version 0.7.15
 Summary:        Koji support for building layered container images
 
 License:        LGPLv2
@@ -103,6 +108,9 @@ build layered container images.
 
 
 %changelog
+* Thu Oct 17 2019 Clement Verna <cverna@fedoraproject.org> - 0.7.15
+- Update to latest upstream
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.13.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 1565bd7..2e83642 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (koji-containerbuild-ccef977b4ac0429fd9332a687b8ff852ad795fdd.tar.gz) = 7
 SHA512 (koji-containerbuild-49e2b53033d4086a030d4a471dd034b8134d1253.tar.gz) = a119a650e17ac12c770119ffe8b1b5482e33998e7e09518928b3c62de045e4bf2f5984bad0c71dd60e611bd119d0aecda8c8ef1d3ca5c76de7f0d851785a5771
 SHA512 (koji-containerbuild-f91348b0a60ef01d75ea3c3bd927a5231f256398.tar.gz) = fc6d4ca7e8f5832622c9ca931bb0fa1e51dd330fc474d77579ee90f0ea9139257c861d3abcb745528950e5e834e597d4e05b0e506073e7eadaf4e69130322d2f
 SHA512 (koji-containerbuild-b6dcb6555e20e7abd50488f76eb14588ebdf6301.tar.gz) = 0406a3d0802235b17e254ac96f1d8cf505b53a5cc04be47e42cd37713483939bcb15bc093374f5bcf806347c94a534c5d0c43ad440cc26186edcf799737261a7
+SHA512 (koji-containerbuild-dab7501bd461e4ce85c5238f62cb353b3c6e8189.tar.gz) = db2eaca630cee314100b86056e7930434f180c142a62ac1f700376a8e8daf2fb3cb2975885e134697c357ccb6b749da7e5950f1671a6792bbbb9ef24513cc22d