[koha-commits] main Koha release repository branch master updated. v3.06.00-52-ga340ded

[Git repo owner]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".

The branch, master has been updated
       via  a340ded2ca5b95b1ae4f14423cab3fda107ed597 (commit)
      from  6dac7273fbc2eff7805d2a9bda1eb9a275962c00 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a340ded2ca5b95b1ae4f14423cab3fda107ed597
Author: Chris Nighswonger <chris.nighswonger at gmail.com>
Date:   Wed Oct 26 11:14:05 2011 -0400

    Bug 7095: Fixing cut and paste error and removing the use of diag() as this does not produce output when the test is run in a harness
    
    Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
    Signed-off-by: Paul Poulain <paul.poulain at biblibre.com>

-----------------------------------------------------------------------

Summary of changes:
 t/00-merge-conflict-markers.t |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
main Koha release repository