From 8ee1f96b1918cf95dd636651bab6e7f6bf3a01df Mon Sep 17 00:00:00 2001
From: Yury Delendik <ydelendik@mozilla.com>
Date: Thu, 5 Apr 2012 10:12:48 -0500
Subject: [PATCH] Fix the merge

---
 src/obj.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/obj.js b/src/obj.js
index 3baf98f24..200b40a7f 100644
--- a/src/obj.js
+++ b/src/obj.js
@@ -697,7 +697,7 @@ var XRef = (function XRefClosure() {
       return e;
     },
     getCatalogObj: function XRef_getCatalogObj() {
-      return this.this.root;
+      return this.root;
     }
   };