From b98eefc9325609e80e8902ebcbba854585f8d75b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 16 Aug 2009 16:25:19 +0000
Subject: [PATCH] "Invalid mode 'merge' in relatedbox.xml" fix from 2.0b6.5 tag

---
 chrome/content/zotero/bindings/relatedbox.xml | 3 ++-
 chrome/content/zotero/bindings/tagsbox.xml    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/bindings/relatedbox.xml b/chrome/content/zotero/bindings/relatedbox.xml
index 8e5e0656c0..dcf32437f2 100644
--- a/chrome/content/zotero/bindings/relatedbox.xml
+++ b/chrome/content/zotero/bindings/relatedbox.xml
@@ -38,6 +38,7 @@
 					
 					switch (val) {
 						case 'view':
+						case 'merge':
 							break;
 						
 						case 'edit':
@@ -294,4 +295,4 @@
 			</xul:vbox>
 		</content>
 	</binding>
-</bindings>
\ No newline at end of file
+</bindings>
diff --git a/chrome/content/zotero/bindings/tagsbox.xml b/chrome/content/zotero/bindings/tagsbox.xml
index 04d9e6a6e5..15a68f980c 100644
--- a/chrome/content/zotero/bindings/tagsbox.xml
+++ b/chrome/content/zotero/bindings/tagsbox.xml
@@ -40,6 +40,7 @@
 					
 					switch (val) {
 						case 'view':
+						case 'merge':
 							break;
 						
 						case 'edit':
@@ -715,4 +716,4 @@
 			</xul:scrollbox>
 		</content>
 	</binding>
-</bindings>
\ No newline at end of file
+</bindings>