diff options
Diffstat (limited to 'ca/doPartitionDisks.html')
-rw-r--r-- | ca/doPartitionDisks.html | 3 |
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> |