1 files changed, 20 insertions, 0 deletions
diff --git a/et/setupBootloaderAddEntry.html b/et/setupBootloaderAddEntry.html
index 5f9098d..1a9a069 100644
--- a/et/setupBootloaderAddEntry.html
+++ b/et/setupBootloaderAddEntry.html
@@ -27,8 +27,27 @@
            
          
            
+         <p>Selleks tuleb k&auml;sitsi muuta faili /boot/grub2/custom.cfg v&otilde;i kasutada
+            rakendust grub-customizer (selle leiab Mageia tarkvarahoidlast).
+         </p>
          
            
+<<<<<<< HEAD
+         <div class="note" title="M&auml;rkus" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Note">
+               <tr>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[M&auml;rkus]" src="note.png"></td>
+                  <th align="left"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>T&auml;psemat teavet annab meie wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
+                       
+                  </td>
+               </tr>
+            </table>
+=======
          <div class="section" title="BIOS-e s&uuml;steemiga">
             <div class="titlepage">
                <div>
@@ -131,6 +150,7 @@
             
                 
               
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </div>
          
       </div>