Merge pull request alexmattson#25 from travisoneill/fix_urgent

URGENT MERGE ASAP: conflict in code breaks eos start

Author: alexmattson

eos-cli/actions/action_helpers/generate.js

@@ -101,12 +101,12 @@ const generateService = (type, name, path, defaultServer=false) => {
   }
 };
 
-<<<<<<< HEAD
+//<<<<<<< HEAD
 //APPEND
-=======
+//=======
 
 // Append to Master Files
->>>>>>> master
+//>>>>>>> master
 const append = (name, type) => {
   const masterFile = type === "middleware" ? "master_middleware" : "root_reducer";
   const appliedFile = type === "middleware"