formatting

draft3/app/views/car_logs/index.html.erb

@@ -10,35 +10,9 @@
       	<input type="text" name="q">
       	<input type="submit" value="Search">
 
-<<<<<<< HEAD
       <% end %>
 
       <hr>
-=======
-<table border="1">
-  <tr>
-      <th> ID </th> 
-      <th> Plate Number </th> 
-      <th> Time In </th> 
-      <th> Time Out </th> 
-      <th> Color </th> 
-      <th> Brand </th> 
-      <th> </th>
-  </tr>
-
-  <% @records.each do |record| %>
-      <tr>
-        <td><%= record.id %></td> 
-        <td><%= record.plate_number %></td>
-        <td><%= record.time_in %></td>
-        <td><%= record.time_out %></td>
-        <td><%= record.color %></td>
-        <td><%= record.brand %></td>
-        <td><a href="car_logs/delete/<%= record.id %>">Delete </a></td>
-      </tr>
-    <% end %>
-</table>
->>>>>>> f29f6e6f3bad719145aa72a906ddf1f42183c4fe
 
       <table class="table table-striped table-bordered">
         <thead>
@@ -62,6 +36,7 @@
               <td><%= record.brand %></td>
               <td><%= record.time_in %></td>
               <td><%= record.time_out %></td>
+              <td><a class="btn btn-danger" href="car_logs/delete/<%= record.id %>" role ="button">Delete</a></td>
               
             </tr>
           <% end %>