Closed nielsonm closed 10 years ago
Conflicts: bin/deploy_to_production
Any idea why it says there is a conflict in bin/deploy_to_production? Aside from that :+1:.
bin/deploy_to_production
Not exactly sure, there was an issue where the exclude was set to settings.php, not settings.local.php
settings.php
settings.local.php
Conflicts: bin/deploy_to_production