Remove now-unused function pagespec_merge

Now that dependencies are a list of pagespecs with an implicit "or"
operation, there's no need to try to merge pagespecs under normal use.

ikiwiki-transition contains the only use of the function, so move
it there rather than deleting it entirely (it's used to concatenate all
admins' lists of locked pages).

1 files changed, 10 insertions, 0 deletions

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