# Conflicts: # src/InternshipSystem.Api/Controllers/EditionController.cs # src/InternshipSystem.Core/Entity/Edition.cs # src/InternshipSystem.Core/Entity/Internship/InternshipRegistration.cs # src/InternshipSystem.Core/Entity/Report.cs |
||
---|---|---|
.build | ||
.docker | ||
.vscode | ||
props | ||
src | ||
test | ||
.dockerignore | ||
.gitignore | ||
global.json | ||
InternshipSystem.sln |