From a298303f8bccb4b317d2149dfa725b2f28b4c427 Mon Sep 17 00:00:00 2001 From: Evangelos Kourlitis <evangelos.kourlitis@cern.ch> Date: Thu, 22 Apr 2021 01:18:05 -0500 Subject: [PATCH] minor typo fix --- FullSimLight/src/MySteppingAction.cc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/FullSimLight/src/MySteppingAction.cc b/FullSimLight/src/MySteppingAction.cc index cec8a7dd9..a375c6ed4 100644 --- a/FullSimLight/src/MySteppingAction.cc +++ b/FullSimLight/src/MySteppingAction.cc @@ -134,8 +134,4 @@ void MySteppingAction::UserSteppingAction(const G4Step* theStep) { } } - -======= - */ ->>>>>>> 4ed68ed15e5487ec89cde8cfa8b3ed761c16eb66 } \ No newline at end of file -- GitLab