*** empty log message ***

diff --git a/slowcontrol.tex b/slowcontrol.tex
index 5cef927c19c41880171858acd8a00aed04a39918..19e22dc73d232064869a136ccb48624892e58d49 100755 (executable)
--- a/slowcontrol.tex
+++ b/slowcontrol.tex
@@ -378,21 +378,12 @@ A detailed bit definition can be found in table~\ref{CommonCtrlReg2}.
 \hline
 \textbf{Bits} & \textbf{Description} \\
 \hline\hline
-<<<<<<< slowcontrol.tex
 31       & enable trigger \\
 30       & enable debug \\
 29 -- 24 & reserved \\
 23 -- 20 & data format \\
 19 -- 16 & reserved \\
 15 -- 0  & enable frontends \\
-=======
-0 -- 15 & front-end enable \\
-16 -- 19 & reserved \\
-20 -- 23 & data format select \\
-24 -- 29 & reserved \\
-30 & enable debug output \\
-31 & enable trigger \\
->>>>>>> 1.11
 \hline
 \end{tabular}
 \caption{Common Control Register 2 (CCR2)}