From 0c4a4efb26ecaa2fa41634af9214fd2a5e5e6d7f Mon Sep 17 00:00:00 2001 From: ufaks Date: Thu, 10 Mar 2016 17:29:23 +0500 Subject: [PATCH] fix merge conflict --- pos_keyboard/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pos_keyboard/__openerp__.py b/pos_keyboard/__openerp__.py index 659dc55..7ca0ecd 100644 --- a/pos_keyboard/__openerp__.py +++ b/pos_keyboard/__openerp__.py @@ -6,7 +6,7 @@ "website": "https://it-projects.info", 'images': ['images/keyboard.png'], 'category': 'Point Of Sale', - 'version': '1.0.1', + 'version': '1.0.2', 'depends': ['point_of_sale'], 'data': [ 'data.xml',