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

2005-10-18 18:38:45 +00:00 · 2005-10-18 18:38:45 +00:00 · 47ea66e1ea
parent befabc5fee
commit 47ea66e1ea
1 changed files with 0 additions and 4 deletions
--- 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 ( -- )