mirror of
https://github.com/keycloak/keycloak.git
synced 2026-05-06 23:19:35 -05:00
fixed merge conflict
fixes: #27745 Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
committed by
Alexander Schwartz
parent
505ba87d6d
commit
1305f3d6ef
@@ -1,4 +1,4 @@
|
||||
<#import "pf-5-template.ftl" as layout>
|
||||
<#import "template.ftl" as layout>
|
||||
<#import "user-profile-commons.ftl" as userProfileCommons>
|
||||
<#import "register-commons.ftl" as registerCommons>
|
||||
<@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section>
|
||||
|
||||
Reference in New Issue
Block a user