From e1a15400119c4ce6376f3a43eb8d962c49509698 Mon Sep 17 00:00:00 2001 From: Wikinaut Date: Mon, 10 Dec 2012 23:46:54 +0100 Subject: [PATCH] moved to settings.json.template bottom; chg gitignore --- .gitignore | 1 + settings.json.template | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b93678674..a3dd9f3b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ node_modules settings.json +!settings.json.template APIKEY.txt bin/abiword.exe bin/node.exe diff --git a/settings.json.template b/settings.json.template index 897533f51..e37bc4509 100644 --- a/settings.json.template +++ b/settings.json.template @@ -29,9 +29,6 @@ */ - // restricts socket.io transport methods - "socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile'], - //The Type of the database. You can choose between dirty, postgres, sqlite and mysql //You shouldn't use "dirty" for for anything else than testing or development "dbType" : "dirty", @@ -94,5 +91,8 @@ */ /* The log level we are using, can be: DEBUG, INFO, WARN, ERROR */ - "loglevel": "INFO" + "loglevel": "INFO", + + // restrict socket.io transport methods + "socketTransportProtocols" : ['xhr-polling', 'jsonp-polling', 'htmlfile'] }