From d964ea204275b197138af1494c8aabad3a56c3a4 Mon Sep 17 00:00:00 2001
From: Jordan Dukart <jordan@discoverygarden.ca>
Date: Thu, 10 Jul 2014 18:06:59 +0000
Subject: [PATCH] Appease the Travis gods after a merge conflict fail.

---
 islandora.module | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/islandora.module b/islandora.module
index 118f7f78..f0bf796b 100644
--- a/islandora.module
+++ b/islandora.module
@@ -1921,7 +1921,7 @@ function islandora_ingest_form_pre_submit($form, &$form_state) {
   module_load_include('inc', 'islandora', 'includes/ingest.form');
 }
 
-/*
+/**
  * Implements hook_menu_local_tasks_alter().
  */
 function islandora_menu_local_tasks_alter(&$data, $router_item, $root_path) {
@@ -1954,4 +1954,3 @@ function islandora_menu_local_tasks_alter(&$data, $router_item, $root_path) {
     }
   }
 }
-