minor typo fix

a298303f · Vangelis Kourlitis · eca81d3f · a298303f
Commit a298303f authored 3 years ago by Vangelis Kourlitis
--- 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