Arvind Tiwari 606a687bc7 conflicts resolved		2017-10-13 02:08:28 +05:30
..
de/LC_MESSAGES	conflicts resolved	2017-10-13 02:08:28 +05:30