diff options
Diffstat (limited to 'ca/uninstall-Mageia.html')
| -rw-r--r-- | ca/uninstall-Mageia.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ca/uninstall-Mageia.html b/ca/uninstall-Mageia.html index 7e4d71f..4491900 100644 --- a/ca/uninstall-Mageia.html +++ b/ca/uninstall-Mageia.html @@ -31,11 +31,7 @@ <div class="titlepage"> <div> <div> -<<<<<<< HEAD - <h3 class="title"><a name="d5e1247"></a>Howto -======= - <h3 class="title"><a name="d5e1273"></a>Howto ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 + <h3 class="title"><a name="d5e1244"></a>Howto </h3> </div> </div> |