From b167f10e5328540112800fc9fdfed07d1b43ab93 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 15 Feb 2016 17:24:35 +0000
Subject: [PATCH] Bug 15707: Fix conflict with bug 15446 (type vs _type)

---
 Koha/Library/Group.pm  | 2 +-
 Koha/Library/Groups.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Koha/Library/Group.pm b/Koha/Library/Group.pm
index 144ee30..ad2063b 100644
--- a/Koha/Library/Group.pm
+++ b/Koha/Library/Group.pm
@@ -108,7 +108,7 @@ sub store {
 
 =cut
 
-sub type {
+sub _type {
     return 'LibraryGroup';
 }
 
diff --git a/Koha/Library/Groups.pm b/Koha/Library/Groups.pm
index b56baae..9b1356a 100644
--- a/Koha/Library/Groups.pm
+++ b/Koha/Library/Groups.pm
@@ -49,7 +49,7 @@ sub get_root_groups {
 
 =cut
 
-sub type {
+sub _type {
     return 'LibraryGroup';
 }
 
-- 
2.1.4