www

commit b98eefc9325609e80e8902ebcbba854585f8d75b
parent 233b51d3e12667ae31359ae298d28277e2734de1
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 16 Aug 2009 16:25:19 +0000

"Invalid mode 'merge' in relatedbox.xml" fix from 2.0b6.5 tag


Diffstat:
M
chrome/content/zotero/bindings/relatedbox.xml
 | 
4
++--
M
chrome/content/zotero/bindings/tagsbox.xml
 | 
4
++--

2 files changed, 4 insertions(+), 4 deletions(-)
diff --git 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
@@ -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>