From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 13 May 2008 14:56:17 +0000 (+0200)
Subject: contrib/cussh.pl: Remove left over merge stuff..
X-Git-Tag: collectd-4.4.1~7^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3de0a25efcd83c2b870dfc779e94aa50a2498c0f;p=collectd.git

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 d4126bfd..f25c1552 100755
--- 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));