Fix conflict

[factor.git] / core / checksums / crc32 / crc32.factor

diff --git a/core/checksums/crc32/crc32.factor b/core/checksums/crc32/crc32.factor
index 43f7a2b89e27fc5ea86c73c7514205dcf4aa0b57..47da144d4dd6e5a3035805597c109dbf2692cc8a 100644 (file)
--- a/core/checksums/crc32/crc32.factor
+++ b/core/checksums/crc32/crc32.factor
@@ -5,9 +5,9 @@ words io io.binary io.files quotations
 definitions checksums ;
 IN: checksums.crc32
 
-: crc32-polynomial HEX: edb88320 ; inline
+CONSTANT: crc32-polynomial HEX: edb88320
 
-: crc32-table V{ } ; inline
+CONSTANT: crc32-table V{ }
 
 256 [
     8 [