From ba823255fcde17124b6dcc447bb00bc241346312 Mon Sep 17 00:00:00 2001
From: Tim Bielawa <tbielawa@redhat.com>
Date: Thu, 29 Sep 2016 07:32:56 -0700
Subject: Fix conflicts in spec file

---
 utils/setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'utils/setup.py')

diff --git a/utils/setup.py b/utils/setup.py
index eac1b4b2e..563897bb1 100644
--- a/utils/setup.py
+++ b/utils/setup.py
@@ -62,7 +62,7 @@ setup(
     # installed, specify them here.  If using Python 2.6 or less, then these
     # have to be included in MANIFEST.in as well.
     package_data={
-        'ooinstall': ['ansible.cfg', 'ansible_plugins/*'],
+        'ooinstall': ['ansible.cfg', 'ansible-quiet.cfg', 'ansible_plugins/*'],
     },
 
     # Although 'package_data' is the preferred approach, in some case you may
-- 
cgit v1.2.1