fix merge conflict

9 years ago · 0c4a4efb26
1 changed files with 1 additions and 1 deletions
--- 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',