Commit 7416a566 authored by Enrique García Cota's avatar Enrique García Cota

fixed conflict in .gitignore

parents 317da873 d97c98bd
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
*.rbc *.rbc
doc/app doc/app
backup/smtp.yml backup/smtp.yml
/public/javascripts/piwik.js public/javascripts/piwik.js
Subproject commit 838463ae6a5255a2091671645bf7e43856c3b316 Subproject commit 959a184c69573a9b0cad08a36518bbc58168b9de
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment