From 1438e806cd92a2b74f718dab83609797edc0fb53 Mon Sep 17 00:00:00 2001
From: Alan Stanley <astanley@upei.ca>
Date: Thu, 5 Sep 2013 10:34:01 -0300
Subject: [PATCH] resolved merge conflicts

---
 islandora.module | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/islandora.module b/islandora.module
index b02bdc61..4f5ea647 100644
--- a/islandora.module
+++ b/islandora.module
@@ -875,12 +875,9 @@ function islandora_view_object(AbstractObject $object) {
 
   drupal_add_js(array(
     'islandora' => array(
-<<<<<<< HEAD
+
       'print_link' => 'islandora/object/' . $object->id . '/print')), array('type' => 'setting'));
-=======
-      'print_link' => 'islandora/object/' . $object->id . '/print_object')),
-    array('type' => 'setting'));
->>>>>>> dd50626677e1acbc5fe69daf25d13cfa65dae7af
+
   drupal_add_js($path . '/js/add_print.js');
 
   drupal_set_title($object->label);