Fix conflicts

[factor.git] / extra / game-input / dinput / dinput.factor

diff --git a/extra/game-input/dinput/dinput.factor b/extra/game-input/dinput/dinput.factor
index d13fca28cba040cd61880bce0af7e564ff70048a..c6004a82214493de0283ff7969f42ef84e5852a7 100755 (executable)
--- a/extra/game-input/dinput/dinput.factor
+++ b/extra/game-input/dinput/dinput.factor
@@ -2,7 +2,7 @@ USING: windows.dinput windows.dinput.constants parser
 alien.c-types windows.ole32 namespaces assocs kernel arrays
 vectors windows.kernel32 windows.com windows.dinput shuffle
 windows.user32 windows.messages sequences combinators locals
-math.geometry.rect ui.windows accessors math windows alien
+math.rectangles ui.windows accessors math windows alien
 alien.strings io.encodings.utf16 io.encodings.utf16n
 continuations byte-arrays game-input.dinput.keys-array
 game-input ;