Remove now-unused function pagespec_merge

[git.ikiwiki.info.git] / ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 60cea3d54895f531fce1864d5e21224aa1a3e732..9fe0676218668375e773ebb9f7505db9b779ad5a 100755 (executable)
--- 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