From 632e09ac120297a4db61c18e67fcedca220c0523 Mon Sep 17 00:00:00 2001
From: "Evan W. Patton" <ewpatton@gmail.com>
Date: Wed, 28 Sep 2016 20:53:11 -0400
Subject: [PATCH] [WIP] Merge input.js

---
 core/input.js     | 10 ++++++++--
 core/input.js.rej | 23 -----------------------
 2 files changed, 8 insertions(+), 25 deletions(-)
 delete mode 100644 core/input.js.rej

diff --git a/core/input.js b/core/input.js
index b4d11d4e3..82cffb235 100644
--- a/core/input.js
+++ b/core/input.js
@@ -41,8 +41,14 @@ goog.require('goog.asserts');
  * @constructor
  */
 Blockly.Input = function(type, name, block, connection) {
-  /** @type {number} */
-  this.type = type;
+  if (type == Blockly.INDENTED_VALUE) {
+    /** @type {number} */
+    this.type = Blockly.INPUT_VALUE;
+    /** @type {number} */
+    this.subtype = Blockly.INDENTED_VALUE;
+  } else {
+    this.type = type;
+  }
   /** @type {string} */
   this.name = name;
   /**
diff --git a/core/input.js.rej b/core/input.js.rej
deleted file mode 100644
index 76aeb84bd..000000000
--- a/core/input.js.rej
+++ /dev/null
@@ -1,23 +0,0 @@
-***************
-*** 43,49 ****
-   * @constructor
-   */
-  Blockly.Input = function(type, name, block, connection) {
--   this.type = type;
-    this.name = name;
-    this.sourceBlock_ = block;
-    this.connection = connection;
---- 43,55 ----
-   * @constructor
-   */
-  Blockly.Input = function(type, name, block, connection) {
-+   if (type == Blockly.INDENTED_VALUE){
-+     this.type = Blockly.INPUT_VALUE;
-+     this.subtype = Blockly.INDENTED_VALUE;
-+   }
-+   else {
-+     this.type = type;
-+   }
-    this.name = name;
-    this.sourceBlock_ = block;
-    this.connection = connection;