Fix conflict

diff --cc extra/ui/render/test/test.factor
index 8abfc82a35d81be7d91d78e4864be8d344f7c403,dcbc5b9600494dff5d6c5c2e84f1de09def6c009..412ce5a0a5c1782fc330b99e9f6817b8cb25c870
--- 1/extra/ui/render/test/test.factor
--- 2/extra/ui/render/test/test.factor
+++ b/extra/ui/render/test/test.factor
@@@ -1,10 -1,10 +1,10 @@@
 -! Copyright (C) 2008 Slava Pestov.
 +! Copyright (C) 2008, 2009 Slava Pestov.
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors colors arrays kernel sequences math byte-arrays
- namespaces grouping fry cap graphics.bitmap
+ namespaces grouping fry cap images.bitmap
  ui.gadgets ui.gadgets.packs ui.gadgets.borders ui.gadgets.grids
  ui.gadgets.grid-lines ui.gadgets.labels ui.gadgets.buttons
- ui.render ui opengl opengl.gl colors.constants ;
 -ui.render ui opengl opengl.gl images ;
++ui.render ui opengl opengl.gl colors.constants images ;
  IN: ui.render.test
  
  SINGLETON: line-test