Changeset 7a9d968 for storage_xml.c


Ignore:
Timestamp:
2018-03-10T11:30:39Z (7 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Children:
5447c59
Parents:
3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into HEAD

File:
1 edited

Legend:

Unmodified
Added
Removed
  • storage_xml.c

    r3f44e43 r7a9d968  
    290290        }
    291291
     292        handle_settings(node, &xd->irc->b->set);
     293
    292294        if (xt_handle(xp, NULL, 1) == XT_HANDLED) {
    293295                ret = STORAGE_OK;
    294296        }
    295 
    296         handle_settings(node, &xd->irc->b->set);
    297297
    298298error:
Note: See TracChangeset for help on using the changeset viewer.