Fix conflict

[factor.git] / extra / http / http.factor

diff --git a/extra/http/http.factor b/extra/http/http.factor
old mode 100644 (file)
new mode 100755 (executable)
index 6ecb3c5..9e5d34f
--- a/extra/http/http.factor
+++ b/extra/http/http.factor
@@ -74,4 +74,4 @@ IN: http
             hash>query %
         ] if
     ] "" make ;
-    
+