From 25b8faa81a1d357792ae02981372efe9818481f9 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 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js
index 4bcad05b89..7700bdcd1d 100644
--- a/awx/ui/client/src/helpers/Jobs.js
+++ b/awx/ui/client/src/helpers/Jobs.js
@@ -366,12 +366,7 @@ export default
                 mode: 'edit',
                 id: id,
                 scope: scope,
-<<<<<<< HEAD
-                showSearch: false
-=======
-                showSearch: true,
                 title: false
->>>>>>> tagSearchUI
             });
 
             SearchInit({