Fix conflict

[factor.git] / core / io / encodings / encodings.factor

diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor
index 4385bab9d6579628ee9f12fc2663a3e624d25cd0..d8ad1274f219bd909355d6663df407ac2d83bf43 100644 (file)
--- a/core/io/encodings/encodings.factor
+++ b/core/io/encodings/encodings.factor
@@ -14,7 +14,7 @@ GENERIC: encode-char ( char stream encoding -- )
 
 GENERIC: <decoder> ( stream encoding -- newstream )
 
-: replacement-char HEX: fffd ; inline
+CONSTANT: replacement-char HEX: fffd
 
 TUPLE: decoder stream code cr ;