Merge branch 'master' of https://github.com/major/MySQLTuner-perl

major · May 4, 2020 · b6f8f9f · b6f8f9f
2 parents 00ce968 + 6038bd7
commit b6f8f9f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/mysqltuner.pl b/mysqltuner.pl
@@ -6671,5 +6671,4 @@ =head1 COPYRIGHT AND LICENSE
 # indent-tabs-mode: t
 # cperl-indent-level: 8
 # perl-indent-level: 8
-# End:
->>>>>>> 094f16f67cdd90b9e5b08da8bd3e525aa59749d2
+# End: