Fix conflict

[factor.git] / extra / sequences / lib / lib.factor

diff --git a/extra/sequences/lib/lib.factor b/extra/sequences/lib/lib.factor
index cf6521c999f5658f3fe4bec04e52c0a90e052e52..1debe3f91b7d163a8f424bb8573cec88ce06882c 100755 (executable)
--- a/extra/sequences/lib/lib.factor
+++ b/extra/sequences/lib/lib.factor
@@ -51,14 +51,6 @@ MACRO: firstn ( n -- )
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: sigma ( seq quot -- n )
-    [ + ] compose 0 swap reduce ; inline
-
-: count ( seq quot -- n )
-    [ 1 0 ? ] compose sigma ; inline
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
 : map-reduce ( seq map-quot reduce-quot -- result )
     >r [ unclip ] dip [ call ] keep r> compose reduce ; inline