aboutsummaryrefslogtreecommitdiffstats
path: root/ca/doPartitionDisks.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:50:24 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:50:24 +0200
commita979860a232ea8759dc5e6b72074051c9f64b6f8 (patch)
tree908282b77f16f0bc3869f2c0daccd42dbccf1cfa /ca/doPartitionDisks.html
parent7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 (diff)
downloaddrakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar
drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.gz
drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.bz2
drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.xz
drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.zip
Update Catalan files
Diffstat (limited to 'ca/doPartitionDisks.html')
-rw-r--r--ca/doPartitionDisks.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/ca/doPartitionDisks.html b/ca/doPartitionDisks.html
index 1b504a8..04249d6 100644
--- a/ca/doPartitionDisks.html
+++ b/ca/doPartitionDisks.html
@@ -245,8 +245,11 @@
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>