fixed merge conflict
fixes: #27745 Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
parent
505ba87d6d
commit
1305f3d6ef
1 changed files with 1 additions and 1 deletions
|
@ -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>
|
||||||
|
|
Loading…
Reference in a new issue