From c0a8b5c8bb9e01e513ad07fa0b9bd61c59f40716 Mon Sep 17 00:00:00 2001
From: Wim Looman <ghostunderscore@gmail.com>
Date: Mon, 19 Jan 2015 16:27:47 +1300
Subject: [PATCH] Update formidable for TS 1.4

---
 formidable/formidable-tests.ts | 2 +-
 formidable/formidable.d.ts     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/formidable/formidable-tests.ts b/formidable/formidable-tests.ts
index f39da3f8c12dbc..a0f70a713c20d9 100644
--- a/formidable/formidable-tests.ts
+++ b/formidable/formidable-tests.ts
@@ -37,7 +37,7 @@ form.uploadDir = '/my/dir';
 form.keepExtensions = false;
 form.maxFieldsSize = 2 * 1024 * 1024;
 form.maxFields = 1000;
-// form.hash = false; TODO: Waiting on unions
+form.hash = false;
 form.hash = 'sha1';
 form.multiples = false;
 
diff --git a/formidable/formidable.d.ts b/formidable/formidable.d.ts
index bd35c757dc59c2..ba0ed81228c9ca 100644
--- a/formidable/formidable.d.ts
+++ b/formidable/formidable.d.ts
@@ -16,7 +16,7 @@ declare module "formidable" {
 		keepExtensions: boolean;
 		maxFieldsSize: number;
 		maxFields: number;
-		hash: string;
+		hash: string | boolean;
 		multiples: boolean;
 		type: string;
 		bytesReceived: number;