External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

updated merge conflict that was introduced in tag search ui pr

Browse Source
This commit is contained in:
jlmitch5
2016-04-11 09:38:44 -04:00
parent fdc6eb30f9
commit 25b8faa81a
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/helpers/Jobs.js
View File

@@ -366,12 +366,7 @@ export default
mode: 'edit', mode: 'edit',
id: id, id: id,
scope: scope, scope: scope,
<<<<<<< HEAD
showSearch: false
=======
showSearch: true,
title: false title: false
>>>>>>> tagSearchUI
}); });
SearchInit({ SearchInit({