From b91552031178f682c5015f2a885223c420c27e68 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Sun, 8 Jun 2014 11:47:29 -0700
Subject: [PATCH] cpu.architecture: fix using from bad conflict merge.

---
 basis/cpu/architecture/architecture-docs.factor | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/basis/cpu/architecture/architecture-docs.factor b/basis/cpu/architecture/architecture-docs.factor
index b067d4ada4..e78e3412a1 100644
--- a/basis/cpu/architecture/architecture-docs.factor
+++ b/basis/cpu/architecture/architecture-docs.factor
@@ -1,6 +1,6 @@
-USING: assocs classes compiler.cfg.instructions cpu.x86.assembler
-cpu.x86.assembler.operands help.markup help.syntax layouts literals math
-multiline system words ;
+USING: assocs compiler.cfg.instructions cpu.x86.assembler
+cpu.x86.assembler.operands help.markup help.syntax kernel
+layouts literals math multiline system words ;
 IN: cpu.architecture
 
 <<