Bugzilla – Attachment 42849 Details for
Bug 14884
[3.20.X] Test failure from Bug 14470
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14884: remove spurious conflict markers
Bug-14884-remove-spurious-conflict-markers.patch (text/plain), 953 bytes, created by
Jonathan Druart
on 2015-09-24 16:07:27 UTC
(
hide
)
Description:
Bug 14884: remove spurious conflict markers
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2015-09-24 16:07:27 UTC
Size:
953 bytes
patch
obsolete
>From d7606b7c66d625eda33fd0f0bf0898bc8df5f908 Mon Sep 17 00:00:00 2001 >From: Robin Sheat <robin@catalyst.net.nz> >Date: Thu, 24 Sep 2015 14:20:33 +1200 >Subject: [PATCH] Bug 14884: remove spurious conflict markers > >To test: >* Run t/00-merge-conflict-markers.t, ensure it passes > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > t/db_dependent/Circulation.t | 3 --- > 1 file changed, 3 deletions(-) > >diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t >index bb453ea..431bf33 100755 >--- a/t/db_dependent/Circulation.t >+++ b/t/db_dependent/Circulation.t >@@ -596,8 +596,6 @@ C4::Context->dbh->do("DELETE FROM accountlines"); > > $dbh->rollback; > >-<<<<<<< HEAD >-======= > { > # Don't allow renewing onsite checkout > my $barcode = 'R00000XXX'; >@@ -635,5 +633,4 @@ $dbh->rollback; > } > > $schema->storage->txn_rollback(); >->>>>>>> ea92a92... Bug 14470: Do not allow renew for on-site checkouts > 1; >-- >2.1.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14884
:
42830
|
42849
|
42850
|
42912
|
42913