fix chefstyle failures

autocorrects some merges that will be broken when the next
chefstyle is released.

also runs chefstyle after the travis tests, because i'd rather know
how the code is broken rather than how its not pretty.

1 files changed, 1 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index cd91884f68..a4d00b79a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,10 @@ branches:
 # do not run expensive spec tests on PRs, only on branches
 script: "
 set -e;
-bundle exec rake style;
 echo '--color\n-fp' > .rspec;
 sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers;
 sudo -E $(which bundle) exec rake spec;
+bundle exec rake style;
 "
 
 env: