From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 10 Feb 2009 06:44:23 +0000 (-0600)
Subject: Fix conflict
X-Git-Tag: 0.94~2191^2~300
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=6235e950527807bf43bdcab9410b56bb4dd87211

Fix conflict
---

6235e950527807bf43bdcab9410b56bb4dd87211
diff --cc extra/ui/render/test/test.factor
index 8abfc82a35,dcbc5b9600..412ce5a0a5
--- a/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