Ignore local-config file
revert to old local-config
Failed to make push _ local
Merge branch 'dev' into staging

Conflicts:
	.gitignore
	wordpress/local-config.php
commit conflict resolution
ignore local
deleted cached local-config