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

feige

2024-08-29 61cfd79f90f7463ba1f9149d8d988bb081f6a3a1

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
});