# Conflicts:
#	.github/workflows/nodejs.yml
#	.gitignore
#	.prettierrc
#	LICENSE
#	NOTICE
#	README.md
#	bin/run.cmd
#	jest.config.js
#	package-lock.json
#	package.json
#	src/commands/add-approuter.ts
#	src/commands/add-cx-server.ts
#	src/commands/help-page.ts
#	src/commands/init.ts
#	src/commands/package.ts
#	src/index.ts
#	src/templates/add-approuter/approuter/.npmrc
#	src/templates/add-approuter/approuter/manifest.yml.mu
#	src/templates/add-approuter/approuter/package.json
#	src/templates/add-approuter/approuter/xs-app.json.mu
#	src/templates/add-approuter/approuter/xs-security.json.mu
#	src/templates/add-cx-server/cx-server/cx-server
#	src/templates/add-cx-server/cx-server/cx-server.bat
#	src/templates/add-cx-server/cx-server/server.cfg
#	src/templates/init/.npmrc
#	src/templates/init/Jenkinsfile
#	src/templates/init/credentials.json
#	src/templates/init/deployment/.gitkeep
#	src/templates/init/manifest.yml.mu
#	src/templates/init/pipeline_config.yml.mu
#	src/templates/init/s4hana_pipeline/reports/.gitkeep
#	src/templates/init/s4hana_pipeline/reports/coverage-reports/.gitkeep
#	src/templates/init/systems.json
#	src/utils/copy-list.ts
#	src/utils/templates.ts
#	test/add-approuter.spec.ts
#	test/add-cx-server.spec.ts
#	test/e2e.spec.ts
#	test/express/app.js
#	test/express/package.json
#	test/express/public/stylesheets/style.css
#	test/express/routes/index.js
#	test/express/routes/users.js
#	test/express/views/error.jade
#	test/express/views/index.jade
#	test/express/views/layout.jade
#	test/help-page.spec.ts
#	test/init.spec.ts
#	test/nest/.gitignore
#	test/nest/.prettierrc
#	test/nest/README.md
#	test/nest/nest-cli.json
#	test/nest/package-lock.json
#	test/nest/package.json
#	test/nest/src/app.controller.spec.ts
#	test/nest/src/app.controller.ts
#	test/nest/src/app.module.ts
#	test/nest/src/app.service.ts
#	test/nest/src/main.ts
#	test/nest/test/app.e2e-spec.ts
#	test/nest/test/jest-e2e.json
#	test/nest/tsconfig.build.json
#	test/nest/tsconfig.json
#	test/nest/tslint.json
#	test/package.spec.ts
#	test/tsconfig.json
#	test/tslint.json
#	tsconfig.json
#	tslint.json

Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

License

Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

…dk-cli into addTestsFreshExpress

Co-Authored-By: Florian Richter <[email protected]>

Co-Authored-By: Florian Richter <[email protected]>

# Conflicts:
#	package-lock.json
#	package.json

…stsFreshExpress

# Conflicts:
#	package-lock.json
#	package.json

# Conflicts:
#	.gitignore
#	package.json

…stsFreshExpress

# Conflicts:
#	jest.config.js
#	src/commands/init.ts
#	src/templates/init/jest.config.js
#	src/templates/init/jest.integration-test.config.js
#	src/templates/init/jest.unit-test.config.js
#	src/templates/init/test/test-file-info.ts

Co-Authored-By: Florian Richter <[email protected]>