From d7d4bc01d757cf23f71aaa81744440e8c6bdd981 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Feb 2009 20:35:04 +0000
Subject: [PATCH] Fixed "getFile() can only be called on attachment items"
 error whent here was a conflict set with both a regular item and an
 attachment

---
 chrome/content/zotero/bindings/merge.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/bindings/merge.xml b/chrome/content/zotero/bindings/merge.xml
index e2a79b64be..5a4eeaa7e5 100644
--- a/chrome/content/zotero/bindings/merge.xml
+++ b/chrome/content/zotero/bindings/merge.xml
@@ -63,7 +63,7 @@
 					}
 					
 					// Check for note or attachment
-					if (this.type == 'item') {
+					if (val instanceof Zotero.Item) {
 						this.type = this._getTypeFromItem(val);
 					}