From 10546c838a5b5753a3c9316498d5538bd4561fe4 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 18 Dec 2013 17:57:52 +0000
Subject: [PATCH] Remove merge tab until there is time to get it fully working

---
 filemanager/templates/default/file.xet | 2 --
 1 file changed, 2 deletions(-)

diff --git a/filemanager/templates/default/file.xet b/filemanager/templates/default/file.xet
index 2febf5d6e0..0786ac36f0 100644
--- a/filemanager/templates/default/file.xet
+++ b/filemanager/templates/default/file.xet
@@ -259,7 +259,6 @@
 							<tab id="filemanager.file.eacl" label="Extended ACL"/>
 							<tab id="filemanager.file.preview" label="Preview"/>
 							<tab id="filemanager.file.custom" label="Custom fields"/>
-							<tab id="filemanager.file.merge" label="Merge"/>
 						</tabs>
 						<tabpanels>
 							<template id="filemanager.file.general"/>
@@ -267,7 +266,6 @@
 							<template id="filemanager.file.eacl"/>
 							<template id="filemanager.file.preview"/>
 							<template id="filemanager.file.custom"/>
-							<template id="filemanager.file.merge"/>
 						</tabpanels>
 					</tabbox>
 				</row>