From f64824b35c1c6e42ffd3106a7ce2a3c430f1e589 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 28 May 2009 11:40:44 +0800
Subject: Remove extra line from a bad merge

Signed-off-by: Bharat Mediratta <bharat@menalto.com>
---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.gitignore')

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