From 2cfb548b6173be24827e38fa241ec6963257b70f Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@xonotic.org>
Date: Mon, 14 May 2012 17:02:07 +0200
Subject: [PATCH] fix broken links

---
 misc/tools/conflict-rss.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:
-- 
2.39.2