summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-27 20:40:44 -0700
committerBharat Mediratta <bharat@menalto.com>2009-05-27 20:40:44 -0700
commit66b406ebcf337a6a4c1ea1a22e87a8888ed56096 (patch)
treeaae4a6532c61035461e58a94dab93eb71968de1a
parentbb8feb0318723f8e86f769fed899833e5539558f (diff)
Remove extra line from a bad merge
-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