diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 07:20:01 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 07:20:01 +0200 |
commit | 68467999c7eebe3b661cc294d86dccab887c876b (patch) | |
tree | e8e72eda33a5de8beef035a6ebb1c54eeca03a78 /Bugzilla/Template.pm | |
parent | 597ac85a2a4219cb8cb6d916414e47a3abfa8c72 (diff) | |
download | bugzilla-68467999c7eebe3b661cc294d86dccab887c876b.tar.gz bugzilla-68467999c7eebe3b661cc294d86dccab887c876b.tar.xz |
more harmony fixes
Diffstat (limited to 'Bugzilla/Template.pm')
-rw-r--r-- | Bugzilla/Template.pm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index e54877e9b..d4a5b15dc 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -1042,11 +1042,7 @@ sub create { # under mod_perl, use a provider (template loader) that preloads all templates into memory my $provider_class -<<<<<<< HEAD - = BZ_PERSISTENT -======= = $opts{preload} ->>>>>>> dylanwh/mojo-poc ? 'Bugzilla::Template::PreloadProvider' : 'Template::Provider'; |