diff options
| author | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
|---|---|---|
| committer | sembrestels <sembrestels@riseup.net> | 2011-10-13 15:23:11 +0200 |
| commit | 74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf (patch) | |
| tree | 834c120d692be288f261bcae169eedd3d6b31d74 /vendors/dokuwiki/inc/lang/ku/conflict.txt | |
| parent | f8be8643f0faadb2c0ce87d553b7b9d569af5afd (diff) | |
| download | elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.gz elgg-74bd6999c5e5c23ebbf90dbb6bdaabbddd7594cf.tar.bz2 | |
Rename lib/dokuwiki to vendors/dokuwiki
Diffstat (limited to 'vendors/dokuwiki/inc/lang/ku/conflict.txt')
| -rw-r--r-- | vendors/dokuwiki/inc/lang/ku/conflict.txt | 6 |
1 files changed, 6 insertions, 0 deletions
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. + |