diff options
Diffstat (limited to 'hu/doPartitionDisks.html')
| -rw-r--r-- | hu/doPartitionDisks.html | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html index 811400f..10950ca 100644 --- a/hu/doPartitionDisks.html +++ b/hu/doPartitionDisks.html @@ -221,7 +221,6 @@ </div> -<<<<<<< HEAD <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -248,8 +247,6 @@ </div> -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> <tr> |