From 39c52483369ccab79874b08c3f69397245dad3d9 Mon Sep 17 00:00:00 2001
From: jbaldwin <joshrbaldwin@gmail.com>
Date: Fri, 20 Sep 2013 15:55:44 -0600
Subject: [PATCH] Fixed merge problem in underscore.d.ts

---
 underscore/underscore.d.ts | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index a0e5ec9dc..cd7a2867e 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -311,7 +311,7 @@ declare module _ {
 	**/
 	export function every<T>(
 		list: Collection<T>,
-		iterator: ListIterator<T, boolean>,
+		iterator?: ListIterator<T, boolean>,
 		context?: any): boolean;
 
 	/**
@@ -319,7 +319,7 @@ declare module _ {
 	**/
 	export function all<T>(
 		list: Collection<T>,
-		iterator: ListIterator<T, boolean>,
+		iterator?: ListIterator<T, boolean>,
 		context?: any): boolean;
 
 	/**
@@ -1089,8 +1089,6 @@ declare module _ {
 	export function omit(
 		object: any,
 		...keys: string[]): any;
-<<<<<<< HEAD
-=======
 
 	/**
 	* @see _.omit
@@ -1098,7 +1096,6 @@ declare module _ {
 	export function omit(
 		object: any,
 		keys: string[]): any;
->>>>>>> Upgraded underscore to v1.5.2
 
 	/**
 	* Fill in null and undefined properties in object with values from the defaults objects,
@@ -2285,20 +2282,12 @@ interface _Chain<T> {
 	* Wrapped type `any[]`.
 	* @see _.all
 	**/
-<<<<<<< HEAD
-	all(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-=======
 	all(iterator?: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
->>>>>>> Upgraded underscore to v1.5.2
 
 	/**
 	* @see _.all
 	**/
-<<<<<<< HEAD
-	every(iterator: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
-=======
 	every(iterator?: _.ListIterator<T, boolean>, context?: any): _Chain<T>;
->>>>>>> Upgraded underscore to v1.5.2
 
 	/**
 	* Wrapped type `any[]`.