From c59ae5ccbecc0a067cac6c3b50f34f8787cc825f Mon Sep 17 00:00:00 2001
From: hargoniX <hargonix@gmail.com>
Date: Mar 09 2019 03:18:07 +0000
Subject: fixing merge conflicts


---

diff --git a/python-getmac.spec b/python-getmac.spec
index 32f660c..fdfcc4d 100644
--- a/python-getmac.spec
+++ b/python-getmac.spec
@@ -47,5 +47,8 @@ sed -i '1{/^#!\//d}' getmac/__main__.py
 %{_mandir}/man1/*
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Oct 13 2018 Henrik Boeving <hargonix@gmail.com> - 0.6.0-1
 - initial packaging