From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 18 Dec 2008 23:10:01 +0000 (-0600)
Subject: Fix conflict
X-Git-Tag: 0.94~1877^2~308^2
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=b11cbaa3af8c91ecff1c24a4a2b247da73a9476f

Fix conflict
---

b11cbaa3af8c91ecff1c24a4a2b247da73a9476f
diff --cc extra/fuel/fuel.factor
index 58efe2d8ce,017b20b54b..11c70d5125
--- a/extra/fuel/fuel.factor
+++ b/extra/fuel/fuel.factor
@@@ -6,8 -6,8 +6,8 @@@ combinators compiler.units continuation
  eval help io io.files io.pathnames io.streams.string kernel
  lexer listener listener.private make math memoize namespaces
  parser prettyprint prettyprint.config quotations sequences sets
 -sorting source-files strings summary tools.vocabs vectors
 -vocabs vocabs.loader ;
 +sorting source-files strings tools.vocabs vectors vocabs
- vocabs.loader vocabs.parser ;
++vocabs.loader vocabs.parser summary ;
  
  IN: fuel