merge errors

app/views/themen/_small.html.erb

@@ -20,7 +20,8 @@
   <%= raw(frage.text) %>
 </p>
 <% end %>
-<<<<<<< HEAD
+
+
 <% if can?(:edit,small) || !small.meetings.empty? %>
 <b>Treffen/Sitzungen</b>
 <%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
@@ -29,28 +30,20 @@
 <%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
 <%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
 <% end %>
+
+
 <% if can?(:edit,small)|| ! small.documents.empty? %>
+
 <b>Dokumente</b>
 <%= link_to "Neues Dokument", new_document_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
 <div id="<%= Document.new_divid_for(small) %>"></div>
 
-
-
-<% unless small.meetings.empty? %>
-<b>Treffen/Sitzungen</b>
-<% small.meetings.each do |m| %>
-<%= render m %>
- 
-<% end%>
-<% end%>
-
-
 <% unless small.documents.empty? %>
-<b>Dokumente</b>
 
 <% small.documents.each do |d| %>
 <%= render d %>
- 
+
+<% end%>
 <% end%>
 <% end%>