From 0f0cb1df26479a77d475e9623f87b142b16cff72 Mon Sep 17 00:00:00 2001
From: hadaq <hadaq>
Date: Mon, 19 Mar 2012 09:41:20 +0000
Subject: [PATCH] *** empty log message ***

---
 cts.tex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cts.tex b/cts.tex
index 5fa0410..817adc6 100644
--- a/cts.tex
+++ b/cts.tex
@@ -8,7 +8,7 @@
 
 Register addresses from 0xA000 to 0xA0ef is SCM FPGA (1) \\
 Register addresses from 0xA0f0 to 0xA0ff is ECP2M FPGA (2) \\
-<<<<<<< cts.tex
+
 Register addresses from 0xA100 to 0xA100 + 26*500 (500 is number of samples per beam structure), the histograms are created in the SCM FPGA (1) see fig. \ref{ctsbeam}. For the first two the source is selected by 0xA0C2 register next 8 is START next 8 is also START but perpendicular stripes (the source of the start histograms is selected in 0xA0DA register). Next 8 is Veto.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-- 
2.43.0