<p><%= @question.title %></p>
<p><%= @question.content %></p>

<% if @question.author_id == session[:user_id] %>
	<p><%= link_to 'Edit', edit_question_path(@question) %></p>
<% end %>

<h2>Answers</h2>
<% @question.answers.each do |answer| %>

  <%= answer.content %>
<% end %>

  <div><%= answer.content %></div>
  <div><%= link_to 'Edit', edit_answer_path(answer) %></div>

<% end %>
<%= link_to 'Back', questions_path %>


<%= render partial: "answers/new", locals: {answer: @answer} %>


<p><%= @question.title %></p>
<p><%= @question.content %></p>

<% if @question.author_id == session[:user_id] %>
	<p><%= link_to 'Edit', edit_question_path(@question) %></p>
<% end %>

<h2>Answers</h2>
<% @question.answers.each do |answer| %>
  <%= answer.content %>
<% end %>

  <div><%= answer.content %></div>
  <div><%= link_to 'Edit', edit_answer_path(answer) %></div>

<% end %>
<%= link_to 'Back', questions_path %>


<%= render partial: "answers/new", locals: {answer: @answer} %>

Fix merge conflict in questions show
Fix merge conflict in questions show
