Fix merge conflict

paulnsorensen · Jan 30, 2014 · d057082 · d057082
2 parents 2b00831 + 9f0d88c
commit d057082
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,7 @@
 require 'pry'
 require 'database_cleaner'
 
-if RUBY_ENGINE != 'rbx' && ENV['RUN_COVERALLS']
+if ENV['RUN_COVERALLS'] && RUBY_ENGINE != 'rbx'
   require 'coveralls'
   Coveralls.wear!
 end