Scaffolding

src/Scaffolding/DataModel/ActivatedFeature.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ApiToken.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ContactChange.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ExternalId.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/GitlabResourceType.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/GroupMembership.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/Invitation.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/LinkedResourceType.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/Log.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/MetadataExtraction.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/Model.cs

-
-/* Unmerged change from project 'Scaffolding'
-Before:
 using System;
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
-After:
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Metadata;
-using System;
-using System.Collections.Generic;
-*/
-using Microsoft.EntityFrameworkCore;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ProjectDiscipline.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ProjectInstitute.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ProjectQuota.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ProjectResource.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ProjectRole.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/RdsS3resourceType.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/RdsS3wormResourceType.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/RdsresourceType.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {

src/Scaffolding/DataModel/ResourceDiscipline.cs

 using System;
+using System.Collections.Generic;
 
 namespace Coscine.Database.DataModel
 {