From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Thu, 12 Feb 2009 15:22:35 +0000 (-0600)
Subject: Fix conflict
X-Git-Tag: 0.94~2191^2~259
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=8fd159dadd38d04bf3847fdc88b6633abedd0439

Fix conflict
---

8fd159dadd38d04bf3847fdc88b6633abedd0439
diff --cc extra/ui/render/test/test.factor
index 412ce5a0a5,bd3c082652..1aa892557f
--- 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 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 images ;
 -ui.render ui opengl opengl.gl images images.loader ;
++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.pens ui.pens.solid ui.render
++ui opengl opengl.gl colors.constants images images.loader ;
  IN: ui.render.test
  
  SINGLETON: line-test