From 4be861c14137a11a29d2b01684b85bebbcd5f324 Mon Sep 17 00:00:00 2001 From: Will Budic Date: Thu, 15 May 2025 21:44:23 +1000 Subject: [PATCH] . --- apps/PerlCNFWebServerBase.pm | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/apps/PerlCNFWebServerBase.pm b/apps/PerlCNFWebServerBase.pm index 8cafa7f..f80c91a 100644 --- a/apps/PerlCNFWebServerBase.pm +++ b/apps/PerlCNFWebServerBase.pm @@ -1,12 +1,6 @@ package PerlCNFWebServerBase; -<<<<<<< HEAD -use v5.34; -use Syntax::Keyword::Try; -no warnings qw(experimental::signatures); -======= -use v5.36; #For younger Perl rebases change only here version, and bellow line 23. And brace for warnings in logs. +use v5.34; #For younger Perl rebases change only here version, and bellow line 23. And brace for warnings in logs. use Syntax::Keyword::Try; no warnings qw(experimental::signatures); ->>>>>>> e9c13ae (init) use feature qw(signatures); use Exception::Class ('PageHTMLPluginException'); use Module::Load; @@ -26,11 +20,7 @@ package Pagelet { sub import { -<<<<<<< HEAD feature->import(':5.34'); -======= - feature->import(':5.36'); ->>>>>>> e9c13ae (init) feature->import('signatures'); warnings->import; strict->import; @@ -49,10 +39,4 @@ sub import { } - - -<<<<<<< HEAD -1; -======= 1; ->>>>>>> e9c13ae (init) -- 2.34.1