Merge from core

This commit is contained in:
Jesse Beder
2015-01-24 15:59:24 -06:00
5 changed files with 32 additions and 32 deletions

View File

@@ -9,7 +9,7 @@
namespace YAML {
struct EmitterNodeType {
enum value { None, Property, Scalar, FlowSeq, BlockSeq, FlowMap, BlockMap };
enum value { NoType, Property, Scalar, FlowSeq, BlockSeq, FlowMap, BlockMap };
};
}