diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js index e98ce20828..673cc3cb45 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js @@ -4,14 +4,8 @@ export default function f() { } //// [es5ExportDefaultFunctionDeclaration.js] -<<<<<<< HEAD -function f() { -} -exports.default = f; -======= function f() { } -exports.f = f; ->>>>>>> master +exports.default = f; //// [es5ExportDefaultFunctionDeclaration.d.ts] diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js index 95a43270e0..ad1334e810 100644 --- a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js +++ b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration2.js @@ -4,12 +4,7 @@ export default function () { } //// [es5ExportDefaultFunctionDeclaration2.js] -<<<<<<< HEAD -function default_1() { -} -======= -function () { } ->>>>>>> master +function default_1() { } exports.default = default_1;