aboutsummaryrefslogtreecommitdiffstats
path: root/tr/setupBootloader.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:06 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:06 +0200
commit13be3647823b111f5be8d29da7aa4f12ad8292de (patch)
treee8cb0e64a13a5131dac6cb880e154e9e67e35175 /tr/setupBootloader.html
parent3491ae60e905b38a5579409cb51cf9e8044a8bca (diff)
downloaddrakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.gz
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.bz2
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.xz
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.zip
Add Turkish files
Diffstat (limited to 'tr/setupBootloader.html')
-rw-r--r--tr/setupBootloader.html211
1 files changed, 210 insertions, 1 deletions
diff --git a/tr/setupBootloader.html b/tr/setupBootloader.html
index f613a80..defb765 100644
--- a/tr/setupBootloader.html
+++ b/tr/setupBootloader.html
@@ -29,11 +29,19 @@
+<<<<<<< HEAD
+ <div class="section" title="&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e883"></a>&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;
+=======
<div class="section" title="Bootloader interface">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e886"></a>Bootloader interface
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -41,19 +49,31 @@
+<<<<<<< HEAD
+ <p>&Ouml;ntan&#305;ml&#305; olarak Mageia sadece &#351;unu kullan&#305;r:</p>
+=======
<p>By default, Mageia uses exclusively:</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p>Eski/MBR veya Eski/GPT sistem i&ccedil;in Grub2 (grafiksel men&uuml; ile/olmadan) </p>
+=======
<p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p>Bir UEFI sistem i&ccedil;in Grub2-efi</p>
+=======
<p>Grub2-efi for a UEFI system.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -69,7 +89,7 @@
<tr>
<td align="left" valign="top">
- <p>Mageia grafik men&uuml;leri g&uuml;zeldir :</p>
+ <p>Mageia grafik men&uuml;leri g&uuml;zeldir :)</p>
</td>
</tr>
@@ -77,11 +97,19 @@
</div>
+<<<<<<< HEAD
+ <div class="section" title="Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e893"></a>Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2
+=======
<div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -98,11 +126,19 @@
</div>
+<<<<<<< HEAD
+ <div class="section" title="UEFI sistemler &uuml;zerinde Grub2-efi">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e899"></a>UEFI sistemler &uuml;zerinde Grub2-efi
+=======
<div class="section" title="Grub2-efi on UEFI systems">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -110,13 +146,27 @@
+<<<<<<< HEAD
+ <p>Bir UEFI sistemde kullan&#305;c&#305; aray&uuml;z&uuml; biraz farkl&#305;d&#305;r &ccedil;&uuml;nk&uuml; grafiksel men&uuml;n&uuml;n
+ bulunmas&#305; veya bulunmamas&#305; aras&#305;nda tercihte bulunamazs&#305;n&#305;z
+=======
<p>With an UEFI system, the user interface is slightly different as you cannot
choose between with or without graphical menu
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
+<<<<<<< HEAD
+ <p>Mageia bilgisayar&#305;n&#305;za kurdu&#287;unuz tek sistemse, kurulum arac&#305; &ouml;ny&uuml;kleyiciyi
+ (Grub2-efi) ta&#351;&#305;mak &uuml;zere bir ESP (EFI Sistem Disk B&ouml;l&uuml;m&uuml;)
+ olu&#351;turacakt&#305;r. Bilgisayar&#305;n&#305;zda &ouml;nceden bir UEFI i&#351;letim sistemi (Mesela
+ Windows 8) kuruluysa Mageia kurulum arac&#305; Windows taraf&#305;ndan olu&#351;turulmu&#351;
+ olan mevcut ESP alan&#305;n&#305; alg&#305;layarak grub2-efi'yi ekleyecektir. Birden fazla
+ ESP' nin bir arada olmas&#305; m&uuml;mk&uuml;n ise de sadece bir tane olmas&#305; &ouml;nerilir;
+ &ccedil;&uuml;nk&uuml; ka&ccedil; i&#351;letim sistemi kurulu olursa olsun biri yeterlidir.
+=======
<p>If Mageia is the only system installed on your computer, the installer
created an ESP (EFI System Partition) to receive the bootloader
(Grub2-efi). If there are already UEFI operating systems installed on your
@@ -124,6 +174,7 @@
ESP created by Windows and adds grub2-efi. Although it is possible to have
several ESPs, only one is advised and enough whatever the number of
operating systems you have.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -140,7 +191,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e907"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
+=======
<h3 class="title"><a name="d5e910"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -148,31 +203,54 @@
+<<<<<<< HEAD
+ <p>&Ouml;ntan&#305;ml&#305; olarak, sisteminize uygun bi&ccedil;imde Mageia &#351;unlardan birini yeni
+ olarak yazar:
+ </p>
+=======
<p>By default, according to your system, Mageia writes a new:</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p>Ya ilk sabit diskinizdeki MBR (Birincil &Ouml;ny&uuml;kleme Kayd&#305;) i&ccedil;ine veya BIOS
+ disk b&ouml;l&uuml;m&uuml;ne GRUB2 &ouml;ny&uuml;kleyicisi
+=======
<p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
drive or in the BIOS boot partition.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p>ESP i&ccedil;ine Grub2-efi &ouml;ny&uuml;kleyicisi</p>
+=======
<p>Grub2-efi bootloader into the ESP</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
</div>
+<<<<<<< HEAD
+ <p>Zaten bir i&#351;letim sistemi kuruluysa, Mageia bunlar&#305; yeni Mageia &ouml;ny&uuml;kleme
+ men&uuml;n&uuml;ze eklemeyi dener. Bu davran&#305;&#351;&#305; istemiyorsan&#305;z
+ <span class="guibutton">&#304;leri</span> d&uuml;&#287;mesine t&#305;klay&#305;p <span class="guilabel">Yabanc&#305; &#304;&#351;letim
+ Sistemini Sorgula</span> kutucu&#287;undaki i&#351;areti kald&#305;r&#305;n.
+ </p>
+=======
<p>If you already have other operating systems installed, Mageia attempts to
add them to your new Mageia boot menu. If you don't want this behaviour,
click on <span class="guibutton">Next</span> and then uncheck the box
<span class="guilabel">Probe Foreign OS</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -183,7 +261,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e921"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
+=======
<h3 class="title"><a name="d5e924"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -201,11 +283,19 @@
</div>
+<<<<<<< HEAD
+ <div class="section" title="Zincirleme y&uuml;kleme kullan&#305;l&#305;yor">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e924"></a>Zincirleme y&uuml;kleme kullan&#305;l&#305;yor
+=======
<div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e927"></a>Using chain loading
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -213,17 +303,29 @@
+<<<<<<< HEAD
+ <p>&Ouml;ny&uuml;klenebilir bir Mageia istemiyor fakat bir ba&#351;ka i&#351;letim sisteminden
+ zincirleme y&uuml;klenmesini istiyorsan&#305;z, <span class="guibutton">&#304;leri</span> ve
+ <span class="guibutton">Geli&#351;mi&#351;</span> d&uuml;&#287;melerine t&#305;klayarak <span class="guibutton">ESP veya
+ MBR'ye dokunma</span> kutucu&#287;unu i&#351;aretleyin.
+=======
<p>If you don't want a bootable Mageia, but to chain load it from another OS,
click on <span class="guibutton">Next</span>, then on
<span class="guibutton">Advanced</span> and Check the box <span class="guilabel">Do not touch ESP
or MBR</span>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
+<<<<<<< HEAD
+ <p>&Ouml;ny&uuml;kleyicinin eksik oldu&#287;una dair bir uyar&#305; alacaks&#305;n&#305;z. Ancak bunu
+ <span class="guibutton">Tamam</span> d&uuml;&#287;mesine t&#305;klayarak atlay&#305;n.
+=======
<p>You will get a warning that the bootloader is missing, ignore it by clicking
<span class="guibutton">OK</span>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -235,7 +337,11 @@
<div class="titlepage">
<div>
<div>
+<<<<<<< HEAD
+ <h3 class="title"><a name="d5e938"></a>Se&ccedil;enekler
+=======
<h3 class="title"><a name="d5e941"></a>Se&ccedil;enekler
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -243,11 +349,19 @@
+<<<<<<< HEAD
+ <div class="section" title="&#304;lk sayfa">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e940"></a>&#304;lk sayfa
+=======
<div class="section" title="First page">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e943"></a>First page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -259,72 +373,127 @@
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">&Ouml;ntan&#305;ml&#305; g&ouml;r&uuml;nt&uuml;n&uuml;n y&uuml;klemesinden &ouml;nceki gecikme</span>: Bu
+ metin kutusu &ouml;ntan&#305;ml&#305; i&#351;letim sistemi ba&#351;lat&#305;lmadan &ouml;nceki gecikme
+ s&uuml;resini saniye cinsinden ayarlaman&#305;z&#305; sa&#287;lar.
+=======
<p><span class="guilabel">Delay before booting the default image</span>: This text box
lets you set a delay in seconds before the default operating system is
started up.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guibutton">G&uuml;venlik</span>: &Ouml;ny&uuml;kleyici i&ccedil;in bir parola ayarlaman&#305;z&#305;
+ sa&#287;lar. B&ouml;ylece &ouml;ny&uuml;kleme s&#305;ras&#305;nda &ouml;ny&uuml;kleme girdisini se&ccedil;mek veya ayarlar&#305;
+ de&#287;i&#351;tirmek i&ccedil;in bir kullan&#305;c&#305; ad&#305; ile parolas&#305; sorulur. Kullan&#305;c&#305; ad&#305;
+ "root" ve parola da burada se&ccedil;ilendir.
+=======
<p><span class="guilabel">Security</span>: This allows you to set a password for the
bootloader. This means other people can not enter single user mode or change
settings at the boot time.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Parola</span>: Bu metin kutusu parolan&#305;z&#305; olu&#351;turaca&#287;&#305;n&#305;z
+ k&#305;s&#305;md&#305;r
+=======
<p><span class="guilabel">Password</span>: This text box is where you actually put the
password
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Parola (tekrar)</span>: Parolan&#305;z&#305; yeniden yaz&#305;n. B&ouml;ylece
+ Drakx &uuml;stte yaz&#305;lan parola ile uyu&#351;up uyu&#351;mad&#305;&#287;&#305;n&#305; denetler.
+=======
<p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
check that it matches with the one set above.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Geli&#351;mi&#351;</span></p>
+=======
<p><span class="guilabel">Advanced</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">ACPI &ouml;zelli&#287;ini etkinle&#351;tir:</span> ACPI (Geli&#351;mi&#351;
+ Yap&#305;land&#305;rma ve G&uuml;&ccedil; Arabirimi) bir g&uuml;&ccedil; y&ouml;netimi standard&#305;d&#305;r. Kullan&#305;lmayan
+ ayg&#305;tlar&#305; durdurarak, ki bu APM &ouml;ncesinde kullan&#305;lan y&ouml;ntemdir, enerji
+ tasarrufu sa&#287;layabilir. Bu se&ccedil;ene&#287;in i&#351;aretini kald&#305;rmak faydal&#305; olabilir;
+ &ccedil;&uuml;nk&uuml; bilgisayar&#305;n&#305;z ACPI' yi desteklemiyor olabilir veya ACPI
+ uygulamas&#305;n&#305;n baz&#305; sorunlara (mesela rastgele yeniden ba&#351;latmalar veya
+ sistem kilitlenmeleri) yol a&ccedil;t&#305;&#287;&#305;n&#305; d&uuml;&#351;&uuml;n&uuml;yor olabilirsiniz.
+=======
<p><span class="guilabel">Enable ACPI:</span> ACPI (Advanced Configuration and Power
Interface) is a standard for the power management. It can save energy by
stopping unused devices, this was the method used before APM. Unchecking it
could be useful if, for example, your computer does not support ACPI or if
you think the ACPI implementation might cause some problems (for instance
random reboots or system lockups).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">SMP &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bu se&ccedil;enek, &ccedil;ok &ccedil;ekirdekli
+ i&#351;lemcilerde simetrik &ccedil;oklu i&#351;lemeyi etkinle&#351;tirir veya devre d&#305;&#351;&#305; b&#305;rak&#305;r.
+=======
<p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
multiprocessing for multi core processors.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bunu etkinle&#351;tirmek
+ i&#351;letim sisteminin Geli&#351;mi&#351; Programlanabilir Kesme Denetleyicisi-APIC-ne
+ eri&#351;imini sa&#287;lar. APIC ayg&#305;tlar&#305; daha karma&#351;&#305;k &ouml;ncelikleme modellerine ve
+ Geli&#351;mi&#351; IRQ (Kesme Talebi) y&ouml;netimine izin verir.
+=======
<p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the
operating system access to the Advanced Programmable Interrupt
Controller. APIC devices permit more complex priority models, and Advanced
IRQ (Interrupt Request) management.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Yerel APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Burada, bir SMP
+ sistemde belli bir i&#351;lemci i&ccedil;in t&uuml;m d&#305;&#351; kesmeleri y&ouml;neten yerel APIC
+ &ouml;zelli&#287;ini ayarlayabilirsiniz.
+=======
<p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
manages all external interrupts for a specific processor in an SMP system.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -338,11 +507,19 @@
</div>
+<<<<<<< HEAD
+ <div class="section" title="Sonraki sayfa">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e972"></a>Sonraki sayfa
+=======
<div class="section" title="Next page">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e975"></a>Next page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -354,38 +531,70 @@
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">&Ouml;ntan&#305;ml&#305;:</span> &Ouml;ntan&#305;ml&#305; olarak ba&#351;lat&#305;lacak i&#351;letim
+ sistemi
+=======
<p><span class="guilabel">Default:</span> Operating system started up by default
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Sonuna ekle:</span> Bu se&ccedil;enek &ccedil;ekirdek bilgisini ge&ccedil;menizi
+ veya &ccedil;ekirde&#287;e &ouml;ny&uuml;kleme s&#305;ras&#305;nda daha fazla bilgi vermesini s&ouml;ylemenizi
+ sa&#287;lar.
+=======
<p><span class="guilabel">Append:</span> This option lets you pass the kernel
information or tell the kernel to give you more information as it boots.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Yabanc&#305; &#304;&#351;letim Sistemini Sorgula</span>: yukar&#305;ya bak&#305;n&#305;z
+ <a class="link" href="setupBootloader.html#setupMageiaBootloader">Bir Mageia &ouml;ny&uuml;kleyicisini
+ kullanma</a></p>
+=======
<p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Geli&#351;mi&#351;</span></p>
+=======
<p><span class="guilabel">Advanced</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="guilabel">Ekran kipi:</span> Bu se&ccedil;enek, &ouml;ny&uuml;kleme men&uuml;s&uuml;n&uuml;n kullanaca&#287;&#305;
+ ekran boyutunu ve renk derinli&#287;ini ayarlar. A&#351;a&#287;&#305; y&ouml;nl&uuml; &uuml;&ccedil;gene
+ t&#305;klad&#305;&#287;&#305;n&#305;zda daha fazla boyut ve renk derinli&#287;i se&ccedil;enekleri &ouml;nerilir.
+=======
<p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth
the boot menu will use. If you click the down triangle you will be offered
other size and colour depth options.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
+<<<<<<< HEAD
+ <p><span class="bold"><strong>ESP veya MBR'ye dokunma </strong></span>: yukar&#305;ya bak&#305;n&#305;z
+ <a class="link" href="setupBootloader.html#setupChainLoading">Zincirleme y&uuml;klemeyi kullanma</a></p>
+=======
<p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>