aboutsummaryrefslogtreecommitdiffstats
path: root/hu/exitInstall.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/exitInstall.html')
-rw-r--r--hu/exitInstall.html22
1 files changed, 22 insertions, 0 deletions
diff --git a/hu/exitInstall.html b/hu/exitInstall.html
index 3b486fb..390af31 100644
--- a/hu/exitInstall.html
+++ b/hu/exitInstall.html
@@ -22,6 +22,13 @@
</div>
</div>
</div>
+<<<<<<< HEAD
+
+
+
+
+
+=======
@@ -32,6 +39,7 @@
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p><a name="exitInstall-pa1"></a>You have finished installing and configuring
@@ -46,6 +54,19 @@
<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>
+
+
+ <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>
+=======
will be automatically selected and started.
</p>
@@ -59,6 +80,7 @@
</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>