aboutsummaryrefslogtreecommitdiffstats
path: root/hu/exitInstall.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/exitInstall.html')
-rw-r--r--hu/exitInstall.html29
1 files changed, 0 insertions, 29 deletions
diff --git a/hu/exitInstall.html b/hu/exitInstall.html
index 390af31..bca3d7d 100644
--- a/hu/exitInstall.html
+++ b/hu/exitInstall.html
@@ -22,24 +22,11 @@
</div>
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p><a name="exitInstall-pa1"></a>You have finished installing and configuring
@@ -54,7 +41,6 @@
<p><a name="exitInstall-pa3"></a>If you didn't adjust the settings for the bootloader, your Mageia install
-<<<<<<< HEAD
will be automatically selected and started.
</p>
@@ -66,21 +52,6 @@
<p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to
Mageia
</p>
-=======
- will be automatically selected and started.
- </p>
-
-
- <p><a name="exitInstall-pa4"></a>Enjoy!
- </p>
-
-
- <p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to
- Mageia
- </p>
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>