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

[collectd.git] / contrib / cussh.pl

diff --git a/contrib/cussh.pl b/contrib/cussh.pl
index d4126bf..f25c155 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));