From 57b1535b08e97f93529e0a8e1de16a538f3c4348 Mon Sep 17 00:00:00 2001
From: Bruno Sarlo <bruno@bruno-laptop.(none)>
Date: Sat, 8 Aug 2009 14:06:43 -0300
Subject: Removed settings_local.py to be able to merge.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index a4fc0520..02ec314a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ settings_local.py
 *.pyc
 *.swp
 *.log
+settings_local.py
 nbproject
-- 
cgit v1.2.3-1-g7c22