Fix conflict

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

diff --git a/extra/peg/search/search.factor b/extra/peg/search/search.factor
index 86b6e114cf14e1b67bf074dd5a5071f82ed94531..6b34c038571dda59dfd8efc732668793724c4297 100755 (executable)
--- a/extra/peg/search/search.factor
+++ b/extra/peg/search/search.factor
@@ -2,10 +2,10 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: kernel math io io.streams.string sequences strings
 combinators peg memoize arrays ;
-IN: peg.search 
+IN: peg.search
 
 : tree-write ( object -- )
-  { 
+  {
     { [ dup number?   ] [ write1 ] }
     { [ dup string?   ] [ write ] }
     { [ dup sequence? ] [ [ tree-write ] each ] }
@@ -17,7 +17,7 @@ MEMO: any-char-parser ( -- parser )
 
 : search ( string parser -- seq )
   any-char-parser [ drop f ] action 2array choice repeat0 parse dup [
-    parse-result-ast [ ] subset 
+    parse-result-ast [ ] subset
   ] [
     drop { }
   ] if ;