Trying to recover from git corruption.

2015-05-27 19:40:50 -07:00 · 2015-05-27 19:40:50 -07:00 · dbd6f8e1e9
parent d7b4592ce1
commit dbd6f8e1e9
1 changed files with 0 additions and 4 deletions
--- a/4
+++ b/4
@ -159,11 +159,7 @@
            (gather-all-filenames) 
            (gather-staged-filenames against))]
         [results-of-scan
-<<<<<<< Updated upstream
          (lmap (fn [check] (check-files filenames-to-scan check)) *checks*)]
-=======
-          (lmap (fn [check] (scan-files filenames-to-scan check)) *checks*)]
->>>>>>> Stashed changes
         [exit-code (derive-max-code results-of-scan)]
         [messages (flatten (derive-message-bodies results-of-scan))]]
     (do