From a40f4b61b16c6b142890f83f20e9e90746f0e91e Mon Sep 17 00:00:00 2001
From: jlmitch5 <jlmitch5@ncsu.edu>
Date: Mon, 11 Apr 2016 09:38:44 -0400
Subject: [PATCH] updated merge conflict that was introduced in tag search ui
 pr

---
 awx/ui/client/src/helpers/Jobs.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js
index 627b495809..7700bdcd1d 100644
--- a/awx/ui/client/src/helpers/Jobs.js
+++ b/awx/ui/client/src/helpers/Jobs.js
@@ -366,7 +366,6 @@ export default
                 mode: 'edit',
                 id: id,
                 scope: scope,
-                showSearch: true,
                 title: false
             });