Fix conflict

[factor.git] / extra / peg / search / search-tests.factor

diff --git a/extra/peg/search/search-tests.factor b/extra/peg/search/search-tests.factor
old mode 100644 (file)
new mode 100755 (executable)
index 53dcbd9..b33161d
--- a/extra/peg/search/search-tests.factor
+++ b/extra/peg/search/search-tests.factor
@@ -5,14 +5,14 @@ USING: kernel math math.parser arrays tools.test peg peg.search ;
 IN: temporary
 
 { V{ 123 456 } } [
-  "abc 123 def 456" 'integer' search  
+  "abc 123 def 456" 'integer' search
 ] unit-test
 
 { V{ 123 "hello" 456 } } [
-  "one 123 \"hello\" two 456" 'integer' 'string' 2array choice search  
+  "one 123 \"hello\" two 456" 'integer' 'string' 2array choice search
 ] unit-test
 
 { "abc 246 def 912" } [
-  "abc 123 def 456" 'integer' [ 2 * number>string ] action replace  
+  "abc 123 def 456" 'integer' [ 2 * number>string ] action replace
 ] unit-test