resolved merge conflicts

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);