Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / server / api / commandExecution / index.js

diff --git a/server/api/commandExecution/index.js b/server/api/commandExecution/index.js
index 4b87045..3fcce90 100755 (executable)
--- a/server/api/commandExecution/index.js
+++ b/server/api/commandExecution/index.js
@@ -11,8 +11,12 @@ router.post('/', function(req, res) {
         inputPath  = path.normalize('workspace/'+params.inputDir),
         outputPath = path.normalize('workspace/'+params.outputDir),
         options    = params.options
+<<<<<<< HEAD
 
     var execLine = command
+=======
+    var execLine = '/Users/hiratakengo/Eos/bin/X86MAC64/'+command
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
     console.log(execLine)
     if(options) {
         options.forEach(function(option) {