fix

Author: mysiar

src/index.js

@@ -12,12 +12,8 @@ program
   .usage('entrypoint outputDirectory')
   .option('-r, --resource [resourceName]', 'Generate CRUD for the given resource')
   .option('-p, --hydra-prefix [hydraPrefix]', 'The hydra prefix used by the API', 'hydra:')
-<<<<<<< HEAD
   .option('-g, --generator [generator]', 'The generator to use, one of "react", "react-native", "angular", etc.', 'react')
   .option('-t, --template-directory [templateDirectory]', 'The templates directory base to use. Final directory will be ${templateDirectory}/${generator}', `${__dirname}/../templates/`)
-=======
-  .option('-g, --generator [generator]', 'The generator to use, one of "react", "react-native" ', 'react')
->>>>>>> 3d43b1f377ef84d790d6022c6f61df5301c28246
   .parse(process.argv);
 
 if (2 !== program.args.length && (!process.env.API_PLATFORM_CLIENT_GENERATOR_ENTRYPOINT || !process.env.API_PLATFORM_CLIENT_GENERATOR_OUTPUT)) {