From 2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7 Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 7 Apr 2010 18:09:43 -0400 Subject: Look for the etherpad.local.properties file in the logical location (same directory as the default file) instead of the nonexistent data directory. Also update the .gitignore to ignore this file. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d0995e3..850962b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +etherpad/etc/etherpad.local.properties etherpad/src/etherpad/collab/ace/contentcollector.js etherpad/src/etherpad/collab/ace/domline.js etherpad/src/etherpad/collab/ace/easysync1.js -- cgit v1.2.3 From 4f3e0789c45056a5fa2ab76c006d4357f1cac0fc Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Wed, 7 Apr 2010 18:56:02 -0400 Subject: Many users may add the cos.jar file for import/export; place in .gitignore so those users don't constantly have git whining at them. --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 850962b..c99c9f1 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ etherpad/src/static/js/domline_client.js etherpad/src/static/js/easysync2_client.js etherpad/src/static/js/linestylefilter_client.js etherpad/*.log +infrastructure/lib/cos.jar -- cgit v1.2.3