aboutsummaryrefslogtreecommitdiffstats
path: root/cs/doPartitionDisks.html
diff options
context:
space:
mode:
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>