1 files changed, 0 insertions, 14 deletions
diff --git a/et/index.html b/et/index.html
index 984548c..7875724 100644
--- a/et/index.html
+++ b/et/index.html
@@ -75,7 +75,6 @@
                <dt><span class="section"><a href="setupBootloader.html">Alglaaduri p&otilde;hiseadistused</a></span></dt>
                <dd>
                   <dl>
-<<<<<<< HEAD
                      <dt><span class="section"><a href="setupBootloader.html#d5e904">Alglaaduri liides</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e932">Mageia alglaaduri kasutamine</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e948">Olemasoleva alglaaduri kasutamine</a></span></dt>
@@ -84,19 +83,6 @@
                   </dl>
                </dd>
                <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismen&uuml;&uuml; kirje lisamine v&otilde;i muutmine</a></span></dt>
-=======
-                     <dt><span class="section"><a href="setupBootloader.html#d5e910">BIOS-e s&uuml;steemiga</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e947">UEFI s&uuml;steemiga</a></span></dt>
-                  </dl>
-               </dd>
-               <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismen&uuml;&uuml; kirje lisamine v&otilde;i muutmine</a></span></dt>
-               <dd>
-                  <dl>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e962">BIOS-e s&uuml;steemiga</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e979">UEFI s&uuml;steemiga</a></span></dt>
-                  </dl>
-               </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                <dt><span class="section"><a href="misc-params.html">Seadistuste kokkuv&otilde;te</a></span></dt>
                <dd>
                   <dl>