merge conflicto in Makefile.PL

bodo-hugo-barwich · Aug 26, 2023 · ee42d88 · ee42d88
1 parent 87dec80
commit ee42d88
Showing 1 changed file with 0 additions and 17 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -1,10 +1,4 @@
-<<<<<<< HEAD
-use ExtUtils::MakeMaker::CPANfile;
-=======
 use ExtUtils::MakeMaker;
- 
-
->>>>>>> refs/heads/master
 
 WriteMakefile(
     NAME          => 'Process::SubProcess',
@@ -15,7 +9,6 @@ WriteMakefile(
 
     # VERSION     => '2.0.2',
     MIN_PERL_VERSION => '5.010',
-<<<<<<< HEAD
     test             => { TESTS => 't/*.t' },
     BUILD_REQUIRES   => {
         'ExtUtils::MakeMaker' => '6.46',
@@ -31,16 +24,6 @@ WriteMakefile(
         'YAML'                      => '0',
         'Data::Dump'                => '0',
     },
-=======
-    test             => {TESTS => 't/*.t'},
-	  PREREQ_PM => {
-	    'Getopt::Long::Descriptive' => '0',
-	    'Path::Tiny' => '0',
-	    'JSON' => '0',
-	    'YAML' => '0',
-	    'Data::Dump' => '0',
-	  },
->>>>>>> refs/heads/master
     META_MERGE => {
         'meta-spec' => { version => 2 },
         resources   => {