Skip to content
Commit 673e0697 authored by Dan Morrison's avatar Dan Morrison
Browse files

Merge branch '6.x-2.x' of git.drupal.org:project/taxonomy_xml into 6.x-2.x 

Trying to resolve a syntax error the formatter introduced

Conflicts:
	taxonomy_xml.module
parents d3b23087 5e092596
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment