From 780d3e2c8fdbdec14fe0dbf8da1900c1930e83e0 Mon Sep 17 00:00:00 2001
From: Patrick O'Carroll <ocarroll.patrick@gmail.com>
Date: Thu, 14 Dec 2017 15:50:47 +0100
Subject: [PATCH] fix for merge conflict

---
 public/app/features/admin/partials/users.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/app/features/admin/partials/users.html b/public/app/features/admin/partials/users.html
index 1f03825e30c..e0862375501 100644
--- a/public/app/features/admin/partials/users.html
+++ b/public/app/features/admin/partials/users.html
@@ -3,8 +3,7 @@
 <div class="page-container page-body">
   <div class="page-action-bar">
     <label class="gf-form gf-form--grow gf-form--has-input-icon">
-      <input type="text" class="gf-form-input max-width-30" placeholder="Find user by name/login/email" tabindex="1" give-focus="true"
-        ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.getUsers()" />
+      <input type="text" class="gf-form-input max-width-30" placeholder="Find user by name/login/email" tabindex="1" give-focus="true" ng-model="ctrl.query" ng-model-options="{ debounce: 500 }" spellcheck='false' ng-change="ctrl.getUsers()" />
       <i class="gf-form-input-icon fa fa-search"></i>
     </label>
     <div class="page-action-bar__spacer"></div>