From efcd8d6a743261194b55df3afeec956fde9886d4 Mon Sep 17 00:00:00 2001
From: waspe <waspe>
Date: Tue, 04 Nov 2003 16:37:14 +0000
Subject: remove merge conflict

---
(limited to 'inputmethods/jumpx/opie-jumpx.control')

--
cgit v0.9.0.2