# -*- coding: utf-8 -*-
{
    'name': "Keyboard support in Point Of Sale",
    'author': "IT-Projects LLC, Ivan Yelizariev",
    'summary': 'Module allows to use usual keyboard (not virtual one) in Point of Sale',
    "website": "https://it-projects.info",
    'images': ['images/keyboard.png'],
    'category': 'Point Of Sale',
<<<<<<< HEAD
    'license': 'LGPL-3',
    'version': '1.0.1',
=======
    'version': '1.0.2',
>>>>>>> origin/pos_keyboard_v_8
    'depends': ['point_of_sale'],
    'data': [
         'data.xml',
    ],
    'installable': True,
    'auto_install': False,
}

# -*- coding: utf-8 -*-
{
    'name': "Keyboard support in Point Of Sale",
    'author': "IT-Projects LLC, Ivan Yelizariev",
    'summary': 'Module allows to use usual keyboard (not virtual one) in Point of Sale',
    "website": "https://it-projects.info",
    'images': ['images/keyboard.png'],
    'category': 'Point Of Sale',
    'license': 'LGPL-3',
    'version': '1.0.2',
    'depends': ['point_of_sale'],
    'data': [
         'data.xml',
    ],
    'installable': True,
    'auto_install': False,
}

fix merge conflict