X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/3548b6214f67209b6ba87b741bf8ec45d3256f4f..f7601954a862afd4c5a5b9ba83480af0472e1cf9:/ikiwiki-transition?ds=inline

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 795ab31cb..8a20cf655 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -335,4 +335,14 @@ sub get_banned_users () {
 	return @ret;
 }
 
+# Used to be in IkiWiki, but only used here (to migrate admin prefs into the
+# setup file) now.
+sub pagespec_merge ($$) {
+	my $a=shift;
+	my $b=shift;
+
+	return $a if $a eq $b;
+	return "($a) or ($b)";
+}
+
 1