Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web

feige

2024-03-01 a5a81efad512d32da6d1027fe8ab5cc29a3b6af4

1
2
3
4
5
6
7
8
9
10
11
12
'use strict';
 
var Type = require('../type');
 
function resolveYamlMerge(data) {
  return data === '<<' || data === null;
}
 
module.exports = new Type('tag:yaml.org,2002:merge', {
  kind: 'scalar',
  resolve: resolveYamlMerge
});