Skip to content

Commit b12d955

Browse files
committed
fix(merge): missing a comma
1 parent af77e7c commit b12d955

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/handlers/merge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const mergeJson = file => {
1414
} catch (e) {
1515
log.error('merge', [
1616
'The template file and the current file failed to merge due to a json syntax error in the template file.',
17-
'The current file will be overwritten directly by the template file.'
18-
`path: ${file.targetPath}`
17+
'The current file will be overwritten directly by the template file.',
18+
`path: ${file.targetPath}`,
1919
].join('\n'))
2020
return file
2121
}

0 commit comments

Comments
 (0)