summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-28 11:40:44 +0800
committerBharat Mediratta <bharat@menalto.com>2009-05-28 12:10:29 +0800
commitf64824b35c1c6e42ffd3106a7ce2a3c430f1e589 (patch)
treeaae4a6532c61035461e58a94dab93eb71968de1a /.gitignore
parent84ce0cdefda162917c7b01722a7259ac52c4e30d (diff)
Remove extra line from a bad merge
Signed-off-by: Bharat Mediratta <bharat@menalto.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 0 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 702fa990..a20370a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
# Ignore the var subdirectory
var
-index.local.php
-
-
# Ignore the index.local.php
index.local.php