diff options
Diffstat (limited to 'tr/index.html')
| -rw-r--r-- | tr/index.html | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tr/index.html b/tr/index.html index 2268ca6..4d7a00a 100644 --- a/tr/index.html +++ b/tr/index.html @@ -28,13 +28,8 @@ <dl> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Giriş</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Ortam</a></span></dt> -<<<<<<< HEAD <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Ortamları indirme ve kontrol etme</a></span></dt> <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">ISO yakma veya atma</a></span></dt> -======= - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Ortamları indirme ve kontrol etme</a></span></dt> - <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">ISO yakma veya atma</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="installer.html">DrakX, Mageia Kurulum Aracı</a></span></dt> @@ -80,19 +75,11 @@ <dt><span class="section"><a href="setupBootloader.html">Önyükleyici ana seçenekleri</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="setupBootloader.html#d5e883">Önyükleyici arayüzü</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e907">Bir Mageia önyükleyicisi kullanmak</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e921">Mevcut bir önyükleyiciyi kullanmak</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e924">Zincirleme yükleme kullanılıyor</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e938">Seçenekler</a></span></dt> -======= - <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e910">Bir Mageia önyükleyicisi kullanmak</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e924">Mevcut bir önyükleyiciyi kullanmak</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e927">Using chain loading</a></span></dt> - <dt><span class="section"><a href="setupBootloader.html#d5e941">Seçenekler</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Önyükleme Menü Girdisi Ekleme veya Değiştirme</a></span></dt> @@ -126,11 +113,7 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Mageia' yı Kaldırma</a></span></dt> <dd> <dl> -<<<<<<< HEAD <dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Nasıl</a></span></dt> -======= - <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Nasıl</a></span></dt> ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </dl> </dd> </dl> |