1 files changed, 10 insertions, 0 deletions

diff --git a/tr/setupBootloaderAddEntry.html b/tr/setupBootloaderAddEntry.html
index 5f3b1d3..a2c27cf 100644
--- a/tr/setupBootloaderAddEntry.html
+++ b/tr/setupBootloaderAddEntry.html
@@ -27,8 +27,14 @@
            
          
            
+<<<<<<< HEAD
+         <p>Bunu yapmak i&ccedil;in /boot/grub2/custom.cfg dosyas&#305;n&#305; elle d&uuml;zenlemeli veya
+            Mageia veri kaynaklar&#305;nda bulunan grub-customizer yaz&#305;l&#305;m&#305;n&#305;
+            kullanmal&#305;s&#305;n&#305;z.
+=======
          <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
             software grub-customizer instead (Available in the Mageia repositories).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </p>
          
            
@@ -41,7 +47,11 @@
                <tr>
                   <td align="left" valign="top">
                          
+<<<<<<< HEAD
+                     <p>Daha fazla bilgi i&ccedil;in wiki sayfam&#305;z&#305; okuyun: </p>
+=======
                      <p>For more information, see our 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>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                        
                   </td>
                </tr>