<div class="container -fluid">

  <div class="col-md-10">
    <div class="row">
      <div class="col-md-offset-9 col-md-3">
        <%= render '/shared/enrollments_as_csv' %>
      </div>
    </div>
<<<<<<< HEAD
    <% @enrollments.each do |enrollment| %>
      <% if enrollment.student %>
      <div class="row master-course">
        <div class="col-md-3"><%= enrollment.section.name %></div>
        <div class="col-md-2"><%= enrollment.section.code %></div>
=======
    <% master_order(@enrollments).each do |enrollment| %>
    <% if enrollment.student %>
    <div class="row master-course">
      <div class="col-md-3"><%= enrollment.section.name %></div>
      <div class="col-md-2"><%= enrollment.section.code %></div>
>>>>>>> master

        <div class="col-md-1"><%= enrollment.student.id_number %></div>
        <div class="col-md-1"><%= enrollment.student.last_name %></div>
        <div class="col-md-1"><%= enrollment.student.first_name %></div>
        <div class="col-md-3"><%= enrollment.student.email %></div>
        <div class="col-md-1"><%= enrollment.student.grade_level %></div>
      </div>
      <% end %>
    <% end %>

  </div>
</div>
<div class="container -fluid">

  <div class="col-md-10">
    <div class="row">
      <div class="col-md-offset-9 col-md-3">
        <%= render '/shared/enrollments_as_csv' %>
      </div>
    </div>
    <% @enrollments.each do |enrollment| %>
      <% if enrollment.student %>
      <div class="row master-course">
        <div class="col-md-3"><%= enrollment.section.name %></div>
        <div class="col-md-2"><%= enrollment.section.code %></div>

        <div class="col-md-1"><%= enrollment.student.id_number %></div>
        <div class="col-md-1"><%= enrollment.student.last_name %></div>
        <div class="col-md-1"><%= enrollment.student.first_name %></div>
        <div class="col-md-3"><%= enrollment.student.email %></div>
        <div class="col-md-1"><%= enrollment.student.grade_level %></div>
      </div>
      <% end %>
    <% end %>

  </div>
</div>
Fix remaining file from merge conflict
Fix remaining file from merge conflict
