23 "GeneralParserTest"
23 "GeneralParserTest"
23 "GeneralParserTest"
23 "GeneralParserTest"
merge fix
Merge branch 'master' of https://github.com/tssoft/TsSoft.Docx.TemplateEngine

Conflicts:
	TsSoft.Docx.TemplateEngine.Test/Tags/GeneralParserTest.cs
merge fix