Commit 925ffb89 authored by michael.simon's avatar michael.simon
Browse files

Change line order for better merge readability

parent 4ae46689
......@@ -42,7 +42,7 @@ public interface ServiceService extends BaseService<ServiceEntity, Long> {
List<ServiceEntity> findByParentService(ServiceEntity service);
List<ServiceEntity> findByProjectAdminRole(RoleEntity role);
List<ServiceEntity> findBySshPubKeyApproverRole(RoleEntity role);
List<ServiceEntity> findByProjectAdminRole(RoleEntity role);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment