FUEL: conflict resolution

diff --cc extra/fuel/eval/eval.factor
index 26d399938027290f1de0e0df7b99d7b8f99f4a96,019b9105bccffeda453321890b08e416fbfdf9bc..3f7ce863c7023dee38a455ff0be2486c078d9b4c
--- 1/extra/fuel/eval/eval.factor
--- 2/extra/fuel/eval/eval.factor
+++ b/extra/fuel/eval/eval.factor
@@@ -59,15 -59,12 +59,12 @@@ t fuel-eval-res-flag set-globa
      [ [ parse-lines ] with-compilation-unit call( -- ) ] curry
      [ print-error ] recover ;
  
- : (fuel-eval-each) ( lines -- )
-     [ (fuel-eval) ] each ;
- 
  : (fuel-eval-usings) ( usings -- )
 -    [ "USE: " prepend ] map
 -    (fuel-eval) fuel-forget-error fuel-forget-output ;
 +    [ [ use+ ] curry [ drop ] recover ] each
 +    fuel-forget-error fuel-forget-output ;
  
  : (fuel-eval-in) ( in -- )
 -    [ dup "IN: " prepend 1array (fuel-eval) in set ] when* ;
 +    [ in set ] when* ;
  
  : (fuel-eval-in-context) ( lines in usings -- )
      (fuel-begin-eval)