Fix conflict

[factor.git] / extra / assoc-heaps / assoc-heaps.factor

diff --git a/extra/assoc-heaps/assoc-heaps.factor b/extra/assoc-heaps/assoc-heaps.factor
old mode 100644 (file)
new mode 100755 (executable)
index 0c44950..a5471c2
--- a/extra/assoc-heaps/assoc-heaps.factor
+++ b/extra/assoc-heaps/assoc-heaps.factor
@@ -32,7 +32,7 @@ M: assoc-heap heap-empty? ( assoc-heap -- ? )
     assoc-heap-assoc assoc-empty? ;
 
 M: assoc-heap heap-length ( assoc-heap -- n )
-    assoc-heap-assoc assoc-size ; 
+    assoc-heap-assoc assoc-size ;
 
 M: assoc-heap heap-peek ( assoc-heap -- value key )
     assoc-heap-heap heap-peek ;