From 525a16313e3bdd11fa6513d594abb32dcd2e8507 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= <rafaelcg_stz@hotmail.com>
Date: Wed, 21 Jan 2015 19:45:11 -0200
Subject: [PATCH 1/2] Setup of the development environment.

The .htaccess settings depend on the development environment, in some cases it is not used.
---
 Magento.gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Magento.gitignore b/Magento.gitignore
index 9eb9f045..4e87b1fe 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,3 +1,5 @@
+.htaccess
+.htaccess.sample
 .modgit/
 .modman/
 app/code/community/Phoenix/

From cd72caa6a56e653224ce972786f8043a77a5639c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= <rafaelcg_stz@hotmail.com>
Date: Wed, 21 Jan 2015 23:37:22 -0200
Subject: [PATCH 2/2] Only .htaccess.sample

---
 Magento.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Magento.gitignore b/Magento.gitignore
index 4e87b1fe..6c10e4b5 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,4 +1,3 @@
-.htaccess
 .htaccess.sample
 .modgit/
 .modman/