premerge cleanup

This commit is contained in:
Mark Moser
2016-08-21 14:11:07 -05:00
parent c6f5577670
commit 84fdf750c5
4 changed files with 4 additions and 7 deletions

1
.gitignore vendored
View File

@ -38,7 +38,6 @@ tmux*log
/vendor/bundle
/lib/bundler/man/
/vendor/assets/*
!/vendor/assets/foundation-emails
bower_components/
node_modules/
.DS_Store