mirror of
https://github.com/microsoft/TypeScript.git
synced 2026-06-25 12:40:05 -05:00
Accepting new baselines
This commit is contained in:
@@ -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]
|
||||
|
||||
@@ -4,12 +4,7 @@ export default function () { }
|
||||
|
||||
|
||||
//// [es5ExportDefaultFunctionDeclaration2.js]
|
||||
<<<<<<< HEAD
|
||||
function default_1() {
|
||||
}
|
||||
=======
|
||||
function () { }
|
||||
>>>>>>> master
|
||||
function default_1() { }
|
||||
exports.default = default_1;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user