fixed merge conflict

fixes: #27745
Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2024-03-12 12:35:07 +01:00 committed by Alexander Schwartz
parent 505ba87d6d
commit 1305f3d6ef

View file

@ -1,4 +1,4 @@
<#import "pf-5-template.ftl" as layout> <#import "template.ftl" as layout>
<#import "user-profile-commons.ftl" as userProfileCommons> <#import "user-profile-commons.ftl" as userProfileCommons>
<#import "register-commons.ftl" as registerCommons> <#import "register-commons.ftl" as registerCommons>
<@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section> <@layout.registrationLayout displayMessage=messagesPerField.exists('global') displayRequiredFields=true; section>