Pawan Kumar 81454e4494 remove conflict		2020-12-23 17:02:46 +05:30
..
__init__.py	remove conflict	2020-12-23 17:02:46 +05:30
ir_ui_view.py	remove conflict	2020-12-23 17:02:46 +05:30
models.py	remove conflict	2020-12-23 17:02:46 +05:30