"Merge_fields" is now simply "Merge"

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@279 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/xml-label.c b/glabels2/src/xml-label.c
index 7e07ab1a4b01eaf3ff45fabeaf9994a325192251..1392bad1ded26be5c7035784c7149a2f6f29db91 100644 (file)
--- a/glabels2/src/xml-label.c
+++ b/glabels2/src/xml-label.c
@@ -1369,7 +1369,7 @@ xml_create_merge_fields (xmlNodePtr  root,
 
        merge = gl_label_get_merge (label);
 
-       node = xmlNewChild (root, ns, "Merge_Fields", NULL);
+       node = xmlNewChild (root, ns, "Merge", NULL);
 
        string = gl_merge_get_name (merge);
        xmlSetProp (node, "type", string);