fixed DSSDScorers

NPSimulation/Scorers/DSSDScorers.cc

@@ -204,10 +204,7 @@ G4bool PS_Rectangle::ProcessHits(G4Step* aStep, G4TouchableHistory*) {
   vector<DSSDData>::iterator it;
   // Length
   it = m_HitLength.find(DSSDData::CalculateIndex(t_StripLengthNumber, t_DetectorNumber));
-<<<<<<< HEAD
-=======
 
->>>>>>> upstream/NPTool.2.dev
   if (it != m_HitLength.end()) {
     it->Add(t_Energy);
   }