From d7b4592ce17dd86b8cdc0fef8a793d90e6c00cbc Mon Sep 17 00:00:00 2001
From: "Elf M. Sternberg" <elf.sternberg@gmail.com>
Date: Wed, 27 May 2015 19:39:23 -0700
Subject: [PATCH] Update.

---
 pre-commit | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pre-commit b/pre-commit
index 31948eb..6e68347 100755
--- a/pre-commit
+++ b/pre-commit
@@ -159,7 +159,11 @@
             (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