[koha-commits] main Koha release repository branch master updated. v16.05.00-629-g3a2048e

[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  3a2048eeff57548a7d9b557b0e94d36d1c58e6ef (commit)
      from  8a7a953e5b6c03da01963b47eb963bab73643245 (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 3a2048eeff57548a7d9b557b0e94d36d1c58e6ef
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date:   Sat Sep 3 00:17:20 2016 +0000

    Bug 11360 - Fix merge conflict
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>

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

Summary of changes:
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   58 ++------------------
 1 file changed, 4 insertions(+), 54 deletions(-)


hooks/post-receive
-- 
main Koha release repository