Pawan Kumar 81454e4494 remove conflict		2020-12-23 17:02:46 +05:30
..
data	remove conflict	2020-12-23 17:02:46 +05:30
i18n	remove conflict	2020-12-23 17:02:46 +05:30
models	remove conflict	2020-12-23 17:02:46 +05:30
static/description	remove conflict	2020-12-23 17:02:46 +05:30
tests	remove conflict	2020-12-23 17:02:46 +05:30
views	remove conflict	2020-12-23 17:02:46 +05:30
__init__.py	remove conflict	2020-12-23 17:02:46 +05:30
__manifest__.py	remove conflict	2020-12-23 17:02:46 +05:30