@@ -, +, @@ --- Koha/Schema/Result/Issuingrule.pm | 10 ---------- 1 file changed, 10 deletions(-) --- a/Koha/Schema/Result/Issuingrule.pm +++ a/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", --