Moved merge conflict checking to overcommit

.overcommit.yml

@@ -64,6 +64,8 @@ PreCommit:
     enabled: true
   RailsSchemaUpToDate:
     enabled: true
+  MergeConflicts:
+    enabled: true
 
 PostCommit:
   GitGuilt:

.travis.yml

@@ -41,7 +41,6 @@ script:
     set -e;
     if [ "${STATIC_CHECKS}" = "true" ]; then
       overcommit -r
-      bundle exec ./script/check_static
     else
       bundle exec rake db:migrate --trace
       bundle exec rspec --tag $RSPEC_TAG spec/

script/check_conflicts

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'open3'
-
-# We don't want to include the literal conflict marker here, or we'll match the
-# script itself!
-conflict_marker = '<' * 5
-
-# Search for checked-in files containing conflict markers
-# -l    List only matching files
-# -I    Ignore binary files
-_, stdout, _, wait_thr = Open3.popen3("git", "grep", "-Il", conflict_marker)
-exit_code = wait_thr.value.exitstatus
-
-if exit_code.zero?
-  puts "The following files appear to contain merge conflicts:"
-  puts stdout.gets(nil)
-end