Remove conflict

res/sections/12-les07062016.tex

@@ -69,7 +69,7 @@ \subsection{Haploid and diploid}
 
 \textbf{Meiosis} occurs when a diploid cell produces haploid cells, often
 called ``gametes''. During meiosis a process called \textbf{crossing over}
-occurs, resulting in the exchange of parts between homologous chromosomes. 
+occurs, resulting in the exchange of parts between homologous chromosomes.
 
 In human, the probability that a crossing over occurs within any two loci at
 a distance of 1 million bases is about 1\% per generation.
@@ -103,4 +103,3 @@ \subsection{Cell differentation}
 nuclear genes remains the same. To create a new cell type with new
 characteristics it is not necessary to create new genes but is often sufficient
 to change pattern of expression.
->>>>>>> develop