resolve confilts

2016-05-12 18:45:14 +02:00
parent a2e1b08730
commit d26d859df1
3 changed files with 4 additions and 4 deletions
--- a/app/views/exercises/_file_form.html.slim
+++ b/app/views/exercises/_file_form.html.slim
@ -4,7 +4,7 @@ li.panel.panel-default
    div.clearfix role="button"
      span = f.object.name
      a.pull-right data-toggle="collapse" data-parent="#files" href="#collapse#{id}" collapse
-  .panel-collapse.collapse id="collapse#{id}" role="tabpanel"
+  .panel-collapse.collapse.in id="collapse#{id}" role="tabpanel"
    .panel-body
      .clearfix = link_to(t('shared.destroy'), '#', class:'btn btn-warning btn-sm discard-file pull-right')
      .form-group