Merge pull request #7120 from rabbitmq/mk-merge-marker-in-ejs-in-3.10.16

Remove a merge conflict marker specific to 3.10.x

Author: michaelklishin

deps/rabbitmq_management/priv/www/js/tmpl/users.ejs

@@ -1,17 +1,9 @@
 <h1>Users</h1>
 <div class="section">
-<<<<<<< HEAD
-  <h2>All users</h2>
-  <div class="hider">
-<%= filter_ui(users) %>
-  <div class="updatable">
-<% if (users.length > 0) { %>
-=======
     <%= paginate_ui(users, 'users') %>
 </div>
 <div class="updatable">
     <% if (users.items.length > 0) { %>
->>>>>>> b5551a4901 (Fix Users filtering in Management UI.)
 <table class="list">
   <thead>
     <tr>