From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 May 2012 15:02:07 +0000 (+0200)
Subject: fix broken links
X-Git-Tag: xonotic-v0.7.0~55^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cfb548b6173be24827e38fa241ec6963257b70f;p=xonotic%2Fxonotic.git

fix broken links
---

diff --git a/misc/tools/conflict-rss.sh b/misc/tools/conflict-rss.sh
index c64fffdb..682b78ee 100755
--- a/misc/tools/conflict-rss.sh
+++ b/misc/tools/conflict-rss.sh
@@ -54,7 +54,7 @@ EOF
 	cat >>"$outfilename" <<EOF
 	<item>
 		<title>$branch$repotxt</title>
-		<link>http://git.xonotic.org/?p=$repo;a=shortlog;h=refs/heads/$name/$branch</link>
+		<link>http://git.xonotic.org/?p=$repo;a=shortlog;h=refs/heads/$branch</link>
 		<guid isPermaLink="false">http://de.git.xonotic.org/conflicts/$filename#$hash</guid>
 		<description><![CDATA[
 		Conflicts of $branch at $hash against $masterbranch at $masterhash: