.gitignore

*.rbc
capybara-*.html
.rspec
<<<<<<< HEAD
/log/*
=======
/log
>>>>>>> 154faf0e7806e4ce8a5c58ceb6c2afa7843e621c
/tmp
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
**.orig
rerun.txt
pickle-email-*.html

# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/secrets.yml

<<<<<<< HEAD
## Environment normalisation:
/.bundle
/vendor/bundle

# these should all be checked in to normalise the environment:
=======
## Environment normalization:
/.bundle
/vendor/bundle

# these should all be checked in to normalize the environment:
>>>>>>> 154faf0e7806e4ce8a5c58ceb6c2afa7843e621c
# Gemfile.lock, .ruby-version, .ruby-gemset

# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc

# if using bower-rails ignore default bower_components path bower.json files
/vendor/assets/bower_components
*.bowerrc
bower.json

# Ignore pow environment settings
.powenv
<<<<<<< HEAD

.idea

config/settings.local.yml
config/settings/*.local.yml
config/environments/*.local.yml
config/environments/development.rb

config/database.yml
db/schema.rb

lib/assets/*.csv


=======
>>>>>>> 154faf0e7806e4ce8a5c58ceb6c2afa7843e621c