Skip to content
Snippets Groups Projects
Commit 7f46a9f6 authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Fix merge errors M2-user merge

parent edb79d88
No related branches found
No related tags found
1 merge request!31M2
Pipeline #
...@@ -5,6 +5,7 @@ import org.fuseri.model.dto.course.LanguageTypeDto; ...@@ -5,6 +5,7 @@ import org.fuseri.model.dto.course.LanguageTypeDto;
import org.fuseri.model.dto.course.ProficiencyLevelDto; import org.fuseri.model.dto.course.ProficiencyLevelDto;
import org.fuseri.model.dto.user.AddressDto; import org.fuseri.model.dto.user.AddressDto;
import org.fuseri.model.dto.user.UserDto; import org.fuseri.model.dto.user.UserDto;
import org.fuseri.model.dto.user.UserType;
import org.fuseri.modulecertificate.service.CertificateRepository; import org.fuseri.modulecertificate.service.CertificateRepository;
import org.fuseri.modulecertificate.service.CertificateService; import org.fuseri.modulecertificate.service.CertificateService;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment