Merge branch 'tutorial' into 'master'

Tutorial fix

See merge request !4

tutorial/slides/CoCoTutorial.tex

@@ -344,11 +344,7 @@ $$
  \item Example 3 is a simplified average of the $B_{s}^{0}\to J/\psi KK$ measurements by the LHC
  \item The experiments quote different sets of parameters which can still be combined
  \item E.g. CMS and LHCb quote the polarisation fractions $|A_{\perp}|^2$ and $|A_{0}|^2$ and ATLAS quotes $|A_{\parallel}|^2$ and $|A_{0}|^2$
-<<<<<<< HEAD
  \item[] $\rightarrow$ fit $|A_{\perp}|^2$ in the combination transforming $|A_{\parallel}|^2 = 1-|A_{0}|^2-|A_{\perp}|^2$
-=======
- \item[] $\rightarrow$ fit $|A_{\perp}|^2$ in the combination transforming $|A_{\parallel}|^2 = \sqrt{1-\left(|A_{0}|^2\right)^2-\left(|A_{\perp}|^2\right)^2}$
->>>>>>> master
  \item[]
 \end{itemize}
 \centering
@@ -394,11 +390,7 @@ Including translators
 \begin{frame}{Final remarks}
 Other features
 \begin{itemize}
-<<<<<<< HEAD
  \item External constraints: Just add a \texttt{ResultSet} with the central value and error un the parameter(s) you want to constrain
-=======
- \item Gaussian constraints: Just add a \texttt{ResultSet} with the central value and error un the parameter(s) you want to constrain
->>>>>>> master
  \item \texttt{printLatexTable}: Prints final correlation table in a \texttt{LaTeX} file
  \item[]
 \end{itemize}