Integrating github/staging through commit ab87ed9

This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -559,7 +559,6 @@ bool LoadTableInner(const SParseParams& parseParams, XmlNodeRef& definition, Xml
}
}
const char* tag = definition->getTag();
if (parseParams.useAlways != (IXmlNode*)NULL)
{
assert(!definition->haveAttr("type"));