From 54b68bb109ade19f5b6671a4e6f85835e0d7bfbd Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Apr 30 2018 18:33:29 +0000
Subject: Removing conflict in greenwave config


---

diff --git a/greenwave/config.py b/greenwave/config.py
index c04e007..663c21e 100644
--- a/greenwave/config.py
+++ b/greenwave/config.py
@@ -18,12 +18,9 @@ class Config(object):
     WAIVERDB_API_URL = 'https://waiverdb.fedoraproject.org/api/v1.0'
 
     # Options for outbound HTTP requests made by python-requests
-<<<<<<< HEAD
-=======
     DIST_GIT_BASE_URL = 'https://src.fedoraproject.org'
     DIST_GIT_URL_TEMPLATE = '{DIST_GIT_BASE_URL}/{pkg_name}/{rev}/greenwave.yaml'
     KOJI_BASE_URL = 'https://koji.fedoraproject.org/kojihub'
->>>>>>> 66e68b8... Introducing RemoteRule for extending policies
     REQUESTS_TIMEOUT = (6.1, 15)
     REQUESTS_VERIFY = True