.

diff --git a/apps/PerlCNFWebServerBase.pm b/apps/PerlCNFWebServerBase.pm
index 8cafa7f042d33c27b51844f6c29105805be59f45..f80c91a455a334527ac51972b294e40fb8b3c6f7 100644 (file)
--- 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)