Somehow a couple lines of diff ended up in cvs..

diff --git a/contrib/crypto/sha1.factor b/contrib/crypto/sha1.factor
index 74c09394797118651af6bf5da17eaeb10e9bf921..5a558979cd24c42a210d91f44ee8e13c97740a6a 100644 (file)
--- a/contrib/crypto/sha1.factor
+++ b/contrib/crypto/sha1.factor
@@ -81,11 +81,7 @@ SYMBOL: K
             [ nth-int-be w get push ] 2keep
         ] [
             dup sha1-W w get push
-<<<<<<< sha1.factor
-        ] if
-=======
         ] if 
->>>>>>> 1.8
     ] repeat ;
 
 : init-letters ( -- )