Fix conflict rebase

AyuntamientoMadrid · Dec 7, 2017 · e01e711 · e01e711
1 parent 6774499
commit e01e711
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/app/views/events/_form.html.erb b/app/views/events/_form.html.erb
@@ -112,7 +112,6 @@
         <%= render 'event_agents', f:f %>
 
       </div>
-    </div>
     </fieldset>
 
     <fieldset><!-- Attendees -->

diff --git a/spec/features/admin/events_spec.rb b/spec/features/admin/events_spec.rb
@@ -339,7 +339,6 @@
         describe "Attendees" do
 
           scenario 'Create organization with invalid attendee', :js do
-            skip('pending refactor')
             new_position = create(:position)
             visit new_event_path