fixed merge conflict

Author: iolufemi

README.md

@@ -51,15 +51,23 @@ Then generate your first API endpoint
 $ gulp service --name yourFirstEndpoint // This command will create a CRUD endpoint for yourFirstEndpoint.
 ```
 
+<<<<<<< HEAD
 With the `gulp service` command, you have the option of using either Mongo DB, an SQL compartible DB or using an API generated by this Express Generator as a database model. To use an API as a database you can pass the `baseurl` and the `endpoint` option for the API to the `gulp service `; for an SQL compartible db, pass the `sql` option. See an example below
+=======
+With the `gulp service` command, you have the option of using either Mongo DB, an SQL compatible DB or using an API generated by this Express Generator as a database model. To use an API as a database you can pass the `baseurl` and the `endpoint` option for the API to the `gulp service `; for an SQL compatible db, pass the `sql` option. See an example below
+>>>>>>> feature/sqlDatabaseSupport
 
 ### Using an API as a DB
 
 ```
 $ gulp service --name yourEndpointWithAPIAsDB --baseurl http://localhost:8080 --endpoint users
 ```
 
+<<<<<<< HEAD
 ### Using an SQL compartible database
+=======
+### Using an SQL compatible database
+>>>>>>> feature/sqlDatabaseSupport
 
 ```
 $ gulp service --name yourEndpointWITHSQL --sql

config/development.js

@@ -18,7 +18,7 @@ module.exports = {
     letsencryptSSLVerificationBody: process.env.LETSENCRYPT_VERIFICATION_BODY || 'xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8._v6aFbaRYWeOmSebtlD-X4Ixf5tPsyULMsXM8HjsK-Q',
     maxContentLength: process.env.MAX_CONTENT_LENGTH || '9999',
     enforceSSL: process.env.ENFORCE_SSL || 'no',
-    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '8a398657a489e6362080738a18688b14b5c2bb5e',
+    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '1f4b52a48226258e3ae040323155b064035350cc',
     queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
     queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
     queueUIPort: process.env.QUEUE_UI_PORT || 3000,

config/production.js

@@ -18,7 +18,7 @@ module.exports = {
     letsencryptSSLVerificationBody: process.env.LETSENCRYPT_VERIFICATION_BODY || 'xvArhQBSilF4V30dGUagNAZ96ASipB0b0ex0kXn0za8._v6aFbaRYWeOmSebtlD-X4Ixf5tPsyULMsXM8HjsK-Q',
     maxContentLength: process.env.MAX_CONTENT_LENGTH || '9999',
     enforceSSL: process.env.ENFORCE_SSL || 'no',
-    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '8a398657a489e6362080738a18688b14b5c2bb5e',
+    gitOAuthToken: process.env.GIT_OAUTH_TOKEN || '1f4b52a48226258e3ae040323155b064035350cc',
     queueUIUsername: process.env.QUEUE_UI_USERNAME || 'admin',
     queueUIPassword: process.env.QUEUE_UI_PASSWORD || 'password123/',
     queueUIPort: process.env.QUEUE_UI_PORT || 3000,