From dd328830dddffbe19e9addd7cf8532cbd3600816 Mon Sep 17 00:00:00 2001
From: Brandon Furtwangler <brandon.furtwangler@hotmail.com>
Date: Mon, 8 Feb 2016 20:44:12 -0800
Subject: [PATCH] cleanup

---
 bluebird/bluebird-1.0.d.ts | 4 ++--
 bluebird/bluebird.d.ts     | 6 ------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/bluebird/bluebird-1.0.d.ts b/bluebird/bluebird-1.0.d.ts
index 2a43600d90..7979e8b6f8 100644
--- a/bluebird/bluebird-1.0.d.ts
+++ b/bluebird/bluebird-1.0.d.ts
@@ -319,9 +319,9 @@ declare class Promise<R> implements Promise.Thenable<R> {
 	 *
 	 * Alias for `attempt();` for compatibility with earlier ECMAScript version.
 	 */
-	static try<R>(fn: () => R|Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+	static try<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 
-	static attempt<R>(fn: () => R|Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
+	static attempt<R>(fn: () => R | Promise.Thenable<R>, args?: any[], ctx?: any): Promise<R>;
 
 	/**
 	 * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index a3cb988139..7a53d4e07b 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -51,15 +51,9 @@ interface PromiseConstructor {
      *
      * Alias for `attempt();` for compatibility with earlier ECMAScript version.
      */
-<<<<<<< HEAD
-    try<T>(fn: () => T|PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
-
-    attempt<T>(fn: () => T|PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
-=======
     try<T>(fn: () => T | PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
 
     attempt<T>(fn: () => T | PromiseLike<T>, args?: any[], ctx?: any): Promise<T>;
->>>>>>> 72f0056f69f9a2290d2589c1a692896d24406928
 
     /**
      * Returns a new function that wraps the given function `fn`. The new function will always return a promise that is fulfilled with the original functions return values or rejected with thrown exceptions from the original function.