diff options
author | Mark Wells <mark@freeside.biz> | 2016-04-27 13:15:42 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-04-27 13:16:12 -0700 |
commit | 250ecb161140a253c305cb7c2b55e4f821befbdc (patch) | |
tree | c212a1c99d416741c09da0049fd38ed937122607 /httemplate/elements | |
parent | 19ba8ba34507ec889908271b7238bc58fce5dc80 (diff) |
fix testing on 3.x
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 |