fix conflicts in spec/requests/api/users_spec.rb

spec/requests/api/users_spec.rb

@@ -192,7 +192,6 @@ describe API::Users do
         expect(json_response.size).to eq(1)
         expect(json_response.first['username']).to eq(user.username)
       end
-<<<<<<< HEAD
     end
 
     context "when authenticated and ldap is enabled" do
@@ -205,8 +204,6 @@ describe API::Users do
         username = user.username
         expect(json_response.first["username"]).to eq username
       end
-=======
->>>>>>> master-ce
     end
   end