Catching up to snipe-it/develop branch

snipe · Nov 16, 2021 · f2c3e51 · f2c3e51
1 parent 74ed790
commit f2c3e51
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -73,14 +73,7 @@
                 </td>
               <td>
                 @can('update', $custom_fieldset)
-<<<<<<< HEAD
                 <a href="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}" class="btn btn-sm btn-danger">{{ trans('button.remove') }}</a>
-=======
-                <form method="post" action="{{ route('fields.disassociate', [$field, $custom_fieldset->id]) }}">
-                  @csrf 
-                  <button type="submit" class="btn btn-sm btn-danger">Remove</button>
-                </form>
->>>>>>> 476e17055beb3a2f989946812010d9f23851ca89
                 @endcan
               </td>
             </tr>