left behind merge commit markup

Author: ecpantalone

ingest/admin.py

@@ -26,13 +26,10 @@ class SpecimensInline(admin.TabularInline):
     model = Specimen
 class ImagesInline(admin.TabularInline):
     model = Image
-<<<<<<< HEAD
 class SWCSInline(admin.TabularInline):
     model = SWC
-=======
 class ConsortiaInline(admin.TabularInline):
     model = Consortium
->>>>>>> dev
 admin.site.disable_action('delete_selected')
 @admin.action(description='Mark selected Collection(s) as Validated and Submitted')
 def mark_as_validated_and_submitted(modeladmin, request, queryset):
@@ -124,12 +121,9 @@ class EventsLogAdmin(admin.ModelAdmin):
 @admin.register(ProjectPeople)
 class ProjectPeople(admin.ModelAdmin):
     list_display = ("id", "project_id", "people_id", "is_po", "is_po", "doi_role")
-<<<<<<< HEAD
 @admin.register(SWC)
 class SWC(admin.ModelAdmin):
     list_display = ("id", "tracingFile", "sourceData", "sourceDataSample", "sourceDataSubmission", "coordinates", "coordinatesRegistration", "brainRegion", "brainRegionAtlas", "brainRegionAtlasName", "brainRegionAxonalProjection", "brainRegionDendriticProjection", "neuronType","segmentTags","proofreadingLevel", "notes", "sheet")
-=======
 @admin.register(Consortium)
 class Consortium(admin.ModelAdmin):
     list_display = ("id", "short_name", "long_name")
->>>>>>> dev