Commit 0fa8cd68 authored by Vanessa Silva's avatar Vanessa Silva
Browse files

Resolve conflicts

parent e6dc4d08
Pipeline #41910 passed with stage
in 1 minute and 12 seconds
......@@ -2,7 +2,7 @@
<h1>Contacts</h1>
<div>
<%= form_for :users, :url => "/messages/show", :html => { :method => 'GET' } do |f| %>
I am: <%= f.collection_select :ids, @users, :id, :first_name %> <br>
I am: <%= f.collection_select :ids, @users, :id, :first_name %> <%= current_user.id %> <br>
<%= f.label "Who do you want to chat with?" %> <br>
<% @current_matches.each do |current_match| %>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment