From 2d046beeab730a7419943635c1d9e49c176e7f53 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 18 Dec 2017 02:58:20 +0000 Subject: [PATCH] Bug 19532: Fixing merge conflicts etc --- Koha/Schema/Result/Issuingrule.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm index 16bbb0c..a6320b4 100644 --- a/Koha/Schema/Result/Issuingrule.pm +++ b/Koha/Schema/Result/Issuingrule.pm @@ -215,14 +215,6 @@ __PACKAGE__->table("issuingrules"); extra: {list => ["no","yes","bib_only","item_only"]} is_nullable: 0 -<<<<<<< HEAD -======= -=head2 note - - data_type: 'varchar' - is_nullable: 1 - size: 100 - =head2 recall_due_date_interval data_type: 'integer' @@ -318,8 +310,6 @@ __PACKAGE__->add_columns( extra => { list => ["no", "yes", "bib_only", "item_only"] }, is_nullable => 0, }, - "note", - { data_type => "varchar", is_nullable => 1, size => 100 }, "recall_due_date_interval", { data_type => "integer", is_nullable => 1 }, "recall_overdue_fine", -- 2.1.4