From f3526bd2c494c7e691594b88a01de3a1b93b0cc4 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <DanielRosenwasser@microsoft.com>
Date: Tue, 28 Oct 2014 12:11:52 -0700
Subject: [PATCH] Revert "Introduce .editorconfig file"

This reverts commit f3b1e94d6879f6ddb810aee53eb8007f9cc187f2.
---
 .editorconfig | 16 ----------
 package.json  | 88 +++++++++++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 60 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 0879f3c6c7d..00000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-# http://editorconfig.org
-
-# top-most EditorConfig file
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.json]
-indent_size = 2
-
-[*.yml]
-indent_size = 2
diff --git a/package.json b/package.json
index 535a666a4f9..00752302254 100644
--- a/package.json
+++ b/package.json
@@ -1,46 +1,46 @@
 {
-  "name": "typescript",
-  "author": "Microsoft Corp.",
-  "homepage": "http://typescriptlang.org/",
-  "version": "1.3.0",
-  "licenses": [
-    {
-      "type": "Apache License 2.0",
-      "url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
-    }
-  ],
-  "description": "TypeScript is a language for application scale JavaScript development",
-  "keywords": [
-    "TypeScript",
-    "Microsoft",
-    "compiler",
-    "language",
-    "javascript"
-  ],
-  "bugs": {
-    "url": "https://github.com/Microsoft/TypeScript/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Microsoft/TypeScript.git"
-  },
-  "preferGlobal": true,
-  "main": "./bin/tsc.js",
-  "bin": {
-    "tsc": "./bin/tsc"
-  },
-  "engines": {
-    "node": ">=0.8.0"
-  },
-  "devDependencies": {
-    "browserify": "latest",
-    "chai": "latest",
-    "codeclimate-test-reporter": "latest",
-    "istanbul": "latest",
-    "jake": "latest",
-    "mocha": "latest"
-  },
-  "scripts": {
-    "test": "jake generate-code-coverage"
-  }
+	"name": "typescript",
+	"author": "Microsoft Corp.",
+	"homepage": "http://typescriptlang.org/",
+	"version": "1.3.0",
+	"licenses": [
+		{
+			"type": "Apache License 2.0", 
+			"url": "https://github.com/Microsoft/TypeScript/blob/master/LICENSE.txt"
+		}
+	],
+	"description": "TypeScript is a language for application scale JavaScript development",
+	"keywords": [
+		"TypeScript", 
+		"Microsoft", 
+		"compiler", 
+		"language", 
+		"javascript"
+	],
+	"bugs": {
+		"url" : "https://github.com/Microsoft/TypeScript/issues"
+	},
+	"repository" : { 
+		"type" : "git",	
+		"url" : "https://github.com/Microsoft/TypeScript.git"  
+	},
+	"preferGlobal" : true,
+	"main" : "./bin/tsc.js",
+	"bin" : { 
+		"tsc" : "./bin/tsc" 
+	},
+	"engines" : { 
+		"node" : ">=0.8.0" 
+	},
+	"devDependencies": {
+		"jake" : "latest",
+		"mocha" : "latest",
+		"chai" : "latest",
+		"browserify" : "latest",
+		"istanbul": "latest",
+		"codeclimate-test-reporter": "latest"
+	},
+	"scripts": {
+		"test": "jake generate-code-coverage"
+	}
 }