[koha-commits] main Koha release repository branch master updated. v3.12.00-beta1-1085-gd3a0e60

[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  d3a0e603fb2baa7aef9f1243739b243d0aaff657 (commit)
      from  c26ab35be632e7130a13e94e5767d182a42a2595 (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 d3a0e603fb2baa7aef9f1243739b243d0aaff657
Author: Galen Charlton <gmc at esilibrary.com>
Date:   Sun Sep 8 20:45:22 2013 +0000

    Bug 10320: (follow-up) remove stray merge conflict marker
    
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

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

Summary of changes:
 koha-tmpl/opac-tmpl/prog/en/css/opac.css |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
main Koha release repository