summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Template.pm
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-07-08 07:20:01 +0200
committerDylan William Hardison <dylan@hardison.net>2018-07-08 07:20:01 +0200
commit68467999c7eebe3b661cc294d86dccab887c876b (patch)
treee8e72eda33a5de8beef035a6ebb1c54eeca03a78 /Bugzilla/Template.pm
parent597ac85a2a4219cb8cb6d916414e47a3abfa8c72 (diff)
downloadbugzilla-68467999c7eebe3b661cc294d86dccab887c876b.tar.gz
bugzilla-68467999c7eebe3b661cc294d86dccab887c876b.tar.xz
more harmony fixes
Diffstat (limited to 'Bugzilla/Template.pm')
-rw-r--r--Bugzilla/Template.pm4
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';