aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorJeff Mitchell <etherpad@jefferai.org>2010-04-07 18:09:43 -0400
committerJeff Mitchell <etherpad@jefferai.org>2010-04-07 18:09:43 -0400
commit2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7 (patch)
tree0084c984ae001b93758d5bdcc4feddad9565a6d7 /.gitignore
parentd84d8b6bd3e6443c5d78b761d1585eaec24f77e7 (diff)
downloadetherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.tar.gz
etherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.tar.xz
etherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.zip
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.
Diffstat (limited to '')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
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