From 66b406ebcf337a6a4c1ea1a22e87a8888ed56096 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 27 May 2009 20:40:44 -0700
Subject: Remove extra line from a bad merge

---
 .gitignore | 3 ---
 1 file changed, 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
-- 
cgit v1.2.3