aboutsummaryrefslogtreecommitdiffstats
path: root/cs/doPartitionDisks.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:11:04 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:11:04 +0200
commit606ff2e490e2c86eed83fcd24f9684d1f3b748ec (patch)
tree1d314391835ef146c88f8316fae8d29ccc17a295 /cs/doPartitionDisks.html
parent53c6e9c6182effaccf531785973d11602c9d15cf (diff)
downloaddrakx-installer-help-606ff2e490e2c86eed83fcd24f9684d1f3b748ec.tar
drakx-installer-help-606ff2e490e2c86eed83fcd24f9684d1f3b748ec.tar.gz
drakx-installer-help-606ff2e490e2c86eed83fcd24f9684d1f3b748ec.tar.bz2
drakx-installer-help-606ff2e490e2c86eed83fcd24f9684d1f3b748ec.tar.xz
drakx-installer-help-606ff2e490e2c86eed83fcd24f9684d1f3b748ec.zip
Add cs files
Diffstat (limited to 'cs/doPartitionDisks.html')
-rw-r--r--cs/doPartitionDisks.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/cs/doPartitionDisks.html b/cs/doPartitionDisks.html
index 461b83d..6ca8380 100644
--- a/cs/doPartitionDisks.html
+++ b/cs/doPartitionDisks.html
@@ -238,8 +238,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>