contrib/cussh.pl: Remove left over merge stuff..

How the hell did that get there..?

diff --git a/contrib/cussh.pl b/contrib/cussh.pl
index d4126bfdeeaaaff09bd99d0f497a6472c793d351..f25c1552270e89dd836f7ef78ec8d3853c005197 100755 (executable)
--- a/contrib/cussh.pl
+++ b/contrib/cussh.pl
@@ -105,11 +105,7 @@ sub getid {
 
        print $$string . $/;
        my ($h, $p, $pi, $t, $ti) =
-<<<<<<< collectd-4.3:contrib/cussh.pl
-               $$string =~ m/^(\w+)\/(\w+)(?:-(\w+))?\/(\w+)(?:-(\w+))?\s+/;
-=======
                $$string =~ m#^([^/]+)/([^/-]+)(?:-([^/]+))?/([^/-]+)(?:-([^/]+))?\s*#;
->>>>>>> local:contrib/cussh.pl
        $$string = $';
 
        return if ((! $h) || (! $p) || (! $t));