source: documentation/trunk/packages/dokuwiki-2011-05-25a/inc/lang/mr/conflict.txt@ 25027

Last change on this file since 25027 was 25027, checked in by jmt12, 12 years ago

Adding the packages directory, and within it a configured version of dokuwiki all ready to run

  • Property svn:mime-type set to application/octet-stream
File size: 922 bytes
Line 
1====== à€šà€µà¥€à€š à€†à€µà¥ƒà€€à¥à€€à¥€ à€‰à€ªà€²à€¬à¥à€§ à€†à€¹à¥‡ ======
2
3à€€à¥à€®à¥à€¹à¥€ à€žà€‚à€ªà€Ÿà€Šà€¿à€€ à€•à¥‡à€²à¥‡à€²à¥à€¯à€Ÿ à€Šà€žà¥à€€à€Ÿà€µà¥‡à€œà€Ÿà€šà¥€ à€šà€µà¥€à€š à€†à€µà¥ƒà€€à¥à€€à¥€ à€‰à€ªà€²à€¬à¥à€§ à€†à€¹à¥‡. à€€à¥à€®à¥à€¹à¥€ à€žà€‚à€ªà€Ÿà€Šà€¿à€€ à€•à€°à€€ à€…
4à€žà€²à¥‡à€²à¥à€¯à€Ÿ à€Šà€žà¥à€€à€Ÿà€µà¥‡à€œà€Ÿà€®à€§à¥‡ à€€à¥à€¯à€Ÿà€š à€µà¥‡à€³à¥€ à€‡à€€à€° à€¯à¥‚à€œà€°à€šà¥‡ à€¬à€Šà€² à€•à¥‡à€²à¥à€¯à€Ÿà€ž à€…
5à€žà¥‡ à€˜à€¡à€€à¥‡.
6
7à€–à€Ÿà€²à¥€ à€Šà€°à¥à€¶à€Ÿà€µà€¿à€²à¥‡à€²à¥‡ à€«à€°à€• à€šà¥€à€Ÿ à€€à€ªà€Ÿà€žà€Ÿ à€†à€£à€¿ à€€à¥à€¯à€Ÿà€ªà¥ˆà€•à¥€ à€•à¥à€ à€²à¥‡ à€ à¥‡à€µà€Ÿà€¯à€šà¥‡ à€€à¥‡ à€ à€°à€µà€Ÿ. à€œà€° à€€à¥à€®à¥à€¹à¥€ 'à€žà¥à€°à€•à¥à€·à€¿à€€' à€•à¥‡à€²à€‚ à€€à€° à€€à¥à€®à€šà¥‡ à€¬à€Šà€² à€žà¥à€°à€•à¥à€·à€¿à€€ à€¹à¥‹à€€à¥€à€². à€žà€§à¥à€¯à€Ÿà€šà¥€ à€†à€µà¥ƒà€€à¥à€€à€¿ à€ à¥‡à€µà€£à¥à€¯à€Ÿà€žà€Ÿà€ à¥€ 'à€•à¥…
8à€šà¥à€žà€²' à€µà€° à€•à¥à€²à€¿à€• à€•à€°à€Ÿ.
Note: See TracBrowser for help on using the repository browser.