aboutsummaryrefslogtreecommitdiffstats
path: root/zh_cn/doPartitionDisks.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:51 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:51 +0200
commit53c6e9c6182effaccf531785973d11602c9d15cf (patch)
tree1e4a77c9ae20e2704c7c25e0be2d7b8b787c9990 /zh_cn/doPartitionDisks.html
parent60c6874f090c8811127076961411ed7d8991a504 (diff)
downloaddrakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.gz
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.bz2
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.tar.xz
drakx-installer-help-53c6e9c6182effaccf531785973d11602c9d15cf.zip
Add Chinese simplified files
Diffstat (limited to 'zh_cn/doPartitionDisks.html')
-rw-r--r--zh_cn/doPartitionDisks.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/zh_cn/doPartitionDisks.html b/zh_cn/doPartitionDisks.html
index fad1999..950c010 100644
--- a/zh_cn/doPartitionDisks.html
+++ b/zh_cn/doPartitionDisks.html
@@ -213,8 +213,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>