updated merge conflict that was introduced in tag search ui pr

2026-01-20 14:11:24 -03:30 · 2016-04-11 09:38:44 -04:00 · 2016-04-11 09:38:44 -04:00 · 25b8faa81a
commit 25b8faa81a
parent fdc6eb30f9
1 changed files with 0 additions and 5 deletions
--- 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({