aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-02-08 14:36:53 +0100
committerDario Lombardo <lomato@gmail.com>2018-02-08 13:37:17 +0000
commitbfd2dbcf25749d9f1481c479af4aab098069c303 (patch)
tree223f031ecc951a0ed8d118de6f0d005b46ff2757
parentf814c40ad3d60529fd16ee43464aa45b5c5bdcb8 (diff)
tools: remove garbage from licensecheck.pl.
Change-Id: I9a0e00c9e033618ee2ced94dadf1a98640e0d914 Reviewed-on: https://code.wireshark.org/review/25684 Reviewed-by: Dario Lombardo <lomato@gmail.com>
-rwxr-xr-xtools/licensecheck.pl1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/licensecheck.pl b/tools/licensecheck.pl
index 43a8779e6c..d9274fddd1 100755
--- a/tools/licensecheck.pl
+++ b/tools/licensecheck.pl
@@ -846,7 +846,6 @@ sub parselicense {
$license =~ s/\s+$//;
return $license;
->>>>>>> tools: remake the indentation of licencecheck.pl.
}
sub fatal {