From: hadaq <hadaq>
Date: Thu, 10 Jun 2010 12:58:30 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=607081b6dfbdc25bf17e7c23fffd05e9199c8f16;p=daqdocu.git

*** empty log message ***
---

diff --git a/slowcontrol.tex b/slowcontrol.tex
index 5cef927..19e22dc 100755
--- 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)}