Merge branch 'master' of https://github.com/Nelson-numerical-software/nelson-gitbook

Author: Nelson-numerical-software

_book/chapter_engine.md

@@ -1,20 +1,37 @@
+<<<<<<< HEAD:_book/chapter_engine.md
 
 
 
 	engine
+=======
+```
+engine
+```
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:engine/README.md
 
 engine
 
 ## Description
+<<<<<<< HEAD:_book/chapter_engine.md
 nelson engine functions
 
 
 * [argv](argv.md) - Nelson command line arguments.
+=======
+
+nelson engine functions
+
+* [argv ](/[argv]%28argv.md%29)- Nelson command line arguments.[engine/argv.md](/engine/argv.md "sss")
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:engine/README.md
 * [executable](executable.md) - Executables to start Nelson software.
 * [finish](finish.md) - User finish file.
 * [getnelsonmode](getnelsonmode.md) - Returns current Nelson mode.
 * [isquietmode](isquietmode.md) - Return true if Nelson started with --quiet option.
+<<<<<<< HEAD:_book/chapter_engine.md
 * [#! shebang](shebang.md) - On Unix, Linux operating systems, Parses the rest of the script's initial line as an interpreter directive.
+=======
+* [\#! shebang](shebang.md) - On Unix, Linux operating systems, Parses the rest of the script's initial line as an interpreter directive.
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:engine/README.md
 * [startup](startup.md) - User startup file.
 
 

chapter_functions_manager.md

@@ -1,20 +1,35 @@
+<<<<<<< HEAD:chapter_functions_manager.md
 
 
 
 	functions manager
+=======
+```
+functions manager
+```
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:functions_manager/README.md
 
 functions manager
 
 ## Description
+<<<<<<< HEAD:chapter_functions_manager.md
 functions manager
 
+=======
+
+functions manager
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:functions_manager/README.md
 
 * [addpath](addpath.md) - Add directories to functions search path.
 * [builtin](builtin.md) - Executes built-in function.
 * [clearfun](clearfun.md) - Clear an built-in function.
 * [feval](feval.md) - Evaluates function.
 * [isbuiltin](isbuiltin.md) - Check for the existence of a builtin.
+<<<<<<< HEAD:chapter_functions_manager.md
 * [ismacro](ismacro.md) - Check for the existence of a macro (function).
+=======
+* [ismacro](ismacro.md) - Check for the existence of a macro \(function\).
+>>>>>>> 715e7a1e49a36ffae2c70cfd3d9fed79721d4db5:functions_manager/README.md
 * [macroargs](macroargs.md) - Returns variables names of a function.
 * [path](path.md) - Modify or display Nelson’s load path.
 * [rehash](rehash.md) - Reinitialize Nelson’s search path directory cache.