diff --git a/.gitignore b/.gitignore
index 302953f..9cb8cb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
 app*
 content/robots.txt
+<<<<<<< HEAD
 custom/smtp-config.php*
 .htaccess*
+=======
+custom/smtp-config.php
+content/.htaccess
+>>>>>>> 6034ab6b59a6fed575a2b98cfb044b75a481ba0d