Revert "adding functionTimeout to settings"

This reverts commit a44f23c4e2.

packages/node_modules/@node-red/nodes/core/function/10-function.html

@@ -360,10 +360,6 @@
             name: {value:"_DEFAULT_"},
             func: {value:"\nreturn msg;"},
             outputs: {value:1},
-<<<<<<< Updated upstream
-=======
-            timeout:{value:RED.settings.functionTimeout},
->>>>>>> Stashed changes
             noerr: {value:0,required:true,
                     validate: function(v, opt) {
                         if (!v) {

packages/node_modules/@node-red/nodes/core/function/10-function.js

@@ -503,8 +503,7 @@ module.exports = function(RED) {
     RED.nodes.registerType("function",FunctionNode, {
         dynamicModuleList: "libs",
         settings: {
-            functionExternalModules: { value: true, exportable: true },
-            functionTimeout: { value:0, exportable: true }
+            functionExternalModules: { value: true, exportable: true }
         }
     });
     RED.library.register("functions");

packages/node_modules/node-red/settings.js

@@ -454,9 +454,6 @@ module.exports = {
     /** Allow the Function node to load additional npm modules directly */
     functionExternalModules: true,
 
-    /** a default timeout for function node VM*/
-    functionTimeout:30,
-
     /** The following property can be used to set predefined values in Global Context.
      * This allows extra node modules to be made available with in Function node.
      * For example, the following:
@@ -468,8 +465,6 @@ module.exports = {
         // os:require('os'),
     },
 
-    
-
     /** The maximum number of messages nodes will buffer internally as part of their
      * operation. This applies across a range of nodes that operate on message sequences.
      * defaults to no limit. A value of 0 also means no limit is applied.