From 2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <etherpad@jefferai.org>
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