resolved merge conflict

geofffranks · Oct 28, 2015 · 561fc9d · 561fc9d
2 parents 8fffbd8 + e8020a4
commit 561fc9d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/t/inheritance.t b/t/inheritance.t
@@ -1,3 +1,6 @@
+use warnings;
+use strict;
+
 use Test::MockModule;
 use Test::More;
 

diff --git a/t/mockmodule.t b/t/mockmodule.t
@@ -1,5 +1,6 @@
 use warnings;
 use strict;
+
 use Test::More;
 
 use lib "t/lib";

diff --git a/t/pod.t b/t/pod.t
@@ -1,4 +1,8 @@
+use warnings;
+use strict;
+
 use Test::More;
+
 eval "use Test::Pod 1.00";
 plan skip_all => "Test::Pod 1.00 required for testing POD" if $@;
 all_pod_files_ok();
diff --git a/t/pod_coverage.t b/t/pod_coverage.t
@@ -1,4 +1,8 @@
+use warnings;
+use strict;
+
 use Test::More;
+
 eval "use Test::Pod::Coverage 1.00";
 plan skip_all => "Test::Pod::Coverage 1.00 required for testing pod coverage" if $@;
 all_pod_coverage_ok({also_private => [qr/^TRACE(?:F|_HERE)?|DUMP$/]});