Arvind Tiwari 2a71be354b conflicts resolved		2017-10-17 00:27:50 +05:30
..
LC_MESSAGES	conflicts resolved	2017-10-17 00:27:50 +05:30