diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/header-full.html | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html index 9b2482859..a67538d11 100644 --- a/httemplate/elements/header-full.html +++ b/httemplate/elements/header-full.html @@ -1,4 +1,3 @@ -<<<<<<< HEAD <%doc> Example: @@ -241,11 +240,3 @@ if ( scalar(@agentnums) == 1 ) { } </%init> -======= -% # for testing, disable the page menus/search boxes -% if ( $FS::CurrentUser::CurrentUser->option('header-minimal') ) { -<& header-minimal.html, @_ &> -% } else { -<& header-full.html, @_ &> -% } ->>>>>>> cb6214a... more robust testing platform, #37340 |