From 46b09129c0e0df801d0dd6f526911506a0d36f93 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Tue, 19 Jun 2018 10:02:26 -0300
Subject: [PATCH] Bug 20650: Remove unused virtualshelves/merge.tt

Committed by Jonathan Druart, get out from first patch of this patchset.

It's a follow-up of bug 4019 which removed virtualshelves/merge.pl

Moving this change to its own commit to make it clear in the git log and
easier to backport if needed.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/virtualshelves/merge.tt       | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt
deleted file mode 100644
index e3e374bb11..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/merge.tt
+++ /dev/null
@@ -1,15 +0,0 @@
-[% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; [% shelf %] merge</title>
-[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'header.inc' %]
-
-<h1> [% session %] </h1>
-
-[% IF ( fields ) %][% INCLUDE virtualshelves/merge/selection.tmpl %]
-[% ELSE %]
-<h1>DOIT</h1><pre>[% new %]</pre>
-<h1>ITEMS</h1><pre>[% items %]</pre>
-[% END %]
-
-[% INCLUDE 'intranet-bottom.inc' %]
-
-- 
2.39.5