View | Details | Raw Unified | Return to bug 13952
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt (-6 lines)
Lines 233-247 Link Here
233
233
234
[% MACRO jsinclude BLOCK %]
234
[% MACRO jsinclude BLOCK %]
235
    [% INCLUDE 'datatables.inc' %]
235
    [% INCLUDE 'datatables.inc' %]
236
<<<<<<< HEAD
237
    [% Asset.js("js/admin-menu.js") | $raw %]
236
    [% Asset.js("js/admin-menu.js") | $raw %]
238
    <script>
237
    <script>
239
=======
240
    [% Asset.js("js/admin-menu.js") %]
241
    <script type="text/javascript">
242
        var importing = false;
238
        var importing = false;
243
239
244
>>>>>>> Bug 13952: Import and export authority types
245
        $(document).ready(function() {
240
        $(document).ready(function() {
246
            $("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, {
241
            $("#authtypes").dataTable($.extend(true, {}, dataTablesDefaults, {
247
                "aoColumnDefs": [
242
                "aoColumnDefs": [
248
- 

Return to bug 13952