From 6855412b5f9122882167c1065a1c7b714970430b Mon Sep 17 00:00:00 2001
From: Vratislav Chudoba <chudoba@jinr.ru>
Date: Wed, 11 Jan 2017 15:52:30 +0300
Subject: [PATCH] Probably successful merge of some of the previous commits.

---
 dataClasses/RawEvent.cpp | 8 +-------
 dataClasses/RawEvent.h   | 6 ------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/dataClasses/RawEvent.cpp b/dataClasses/RawEvent.cpp
index 1f074bc..3b8933c 100644
--- a/dataClasses/RawEvent.cpp
+++ b/dataClasses/RawEvent.cpp
@@ -65,21 +65,15 @@ void RawEvent::SetTime(Double_t t, Int_t i) {
 	return;
 }
 
-<<<<<<< HEAD
 Double_t RawEvent::GetTime(Int_t i) {
 		return fTime[i];
 }
 
 Double_t RawEvent::GetAmp(Int_t i) {
-=======
-double RawEvent::GetOneTime(Int_t i) {
+
 		return fTime[i];
 }
 
-double RawEvent::GetOneAmp(Int_t i) {
->>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
-		return fAmp[i];
-}
 //void RawEvent::SetGraphs() {
 //
 //	gAmp->Set(fNPoints);
diff --git a/dataClasses/RawEvent.h b/dataClasses/RawEvent.h
index 56ea129..eb24862 100644
--- a/dataClasses/RawEvent.h
+++ b/dataClasses/RawEvent.h
@@ -62,15 +62,9 @@ public:
 
 	void PrintTime(Int_t i);
 
-<<<<<<< HEAD
 	Double_t GetTime(Int_t i);
 
 	Double_t GetAmp(Int_t i);
-=======
-	double GetOneTime(Int_t i);
-
-	double GetOneAmp(Int_t i);	
->>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
 
 //	void InvertAmp(Double_t a, Int_t i);
 	//Inverts the amplitudes i.e. makes from negative singals 
-- 
2.18.1