Fix conflict

[factor.git] / basis / byte-vectors / byte-vectors.factor

diff --git a/basis/byte-vectors/byte-vectors.factor b/basis/byte-vectors/byte-vectors.factor
index e24c808bbc79e91d299a77f97ac17564c61465b5..d146017db08d636d5022f64fbf833e67f562e376 100644 (file)
--- a/basis/byte-vectors/byte-vectors.factor
+++ b/basis/byte-vectors/byte-vectors.factor
@@ -10,7 +10,7 @@ TUPLE: byte-vector
 { length array-capacity } ;\r
 \r
 : <byte-vector> ( n -- byte-vector )\r
-    <byte-array> 0 byte-vector boa ; inline\r
+    (byte-array) 0 byte-vector boa ; inline\r
 \r
 : >byte-vector ( seq -- byte-vector )\r
     T{ byte-vector f B{ } 0 } clone-like ;\r
@@ -22,7 +22,7 @@ M: byte-vector like
     ] unless ;\r
 \r
 M: byte-vector new-sequence\r
-    drop [ <byte-array> ] [ >fixnum ] bi byte-vector boa ;\r
+    drop [ (byte-array) ] [ >fixnum ] bi byte-vector boa ;\r
 \r
 M: byte-vector equal?\r
     over byte-vector? [ sequence= ] [ 2drop f ] if ;\r