# Conflicts: # app/kac-app/build.gradle # app/kac-app/src/main/java/kr/co/palnet/kac/app/core/security/AppSecurityConfig.java # app/kac-app/src/main/resources/static/docs/index.html # data/pty/src/main/java/kr/co/palnet/kac/data/pty/repository/PtyCstmrGroupRepository.java