X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/7227c2debfeef94b35f7d81f42900aa01820caa3..8b927d4a6565125bc09d18d9e971f804d1e44e0a:/ikiwiki-transition?ds=sidebyside

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