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

Conflicts:
	TsSoft.Docx.TemplateEngine.Test/TsSoft.Docx.TemplateEngine.Test.csproj
23 "GeneralParserTest"
23 "GeneralParserTest"
Merge branch 'master' of https://github.com/tssoft/TsSoft.Docx.TemplateEngine

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