From 6fda0cb5617c74251786060171093ae8b9422d28 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Mon, 30 Mar 2015 02:54:32 -0700
Subject: [PATCH] Accepting new baselines

---
 .../reference/es5ExportDefaultFunctionDeclaration.js      | 8 +-------
 .../reference/es5ExportDefaultFunctionDeclaration2.js     | 7 +------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js b/tests/baselines/reference/es5ExportDefaultFunctionDeclaration.js
index e98ce208283..673cc3cb453 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 95a43270e06..ad1334e810b 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;