From 74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf Mon Sep 17 00:00:00 2001 From: sembrestels Date: Thu, 13 Oct 2011 15:23:11 +0200 Subject: Rename lib/dokuwiki to vendors/dokuwiki --- vendors/dokuwiki/inc/lang/ku/conflict.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 vendors/dokuwiki/inc/lang/ku/conflict.txt (limited to 'vendors/dokuwiki/inc/lang/ku/conflict.txt') diff --git a/vendors/dokuwiki/inc/lang/ku/conflict.txt b/vendors/dokuwiki/inc/lang/ku/conflict.txt new file mode 100644 index 000000000..e139dce26 --- /dev/null +++ b/vendors/dokuwiki/inc/lang/ku/conflict.txt @@ -0,0 +1,6 @@ +====== Guhertoyeke nûtir heye ====== + +Guhertoyeke nûtir a belgeya ku tu biguherînî heye. Sedema wê, bikarhênerkê/î din di hema demê de belge diguherîne. + +Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version. + -- cgit v1.2.3