From 96ad763940735abfe33db1a51f02a0182a97966c Mon Sep 17 00:00:00 2001
From: Thomas Prokscha <nemu@pc8582.psi.ch>
Date: Wed, 17 Feb 2016 14:27:11 +0100
Subject: [PATCH] Removed faulty lines at the beginning and end of file

---
 src/tests/MuTransition/runMuSimulation.C | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/tests/MuTransition/runMuSimulation.C b/src/tests/MuTransition/runMuSimulation.C
index 433d6f67..4c9f8395 100644
--- a/src/tests/MuTransition/runMuSimulation.C
+++ b/src/tests/MuTransition/runMuSimulation.C
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /***************************************************************************
 
   runMuSimulation.C
@@ -298,4 +297,3 @@ void runMuSimulation()
 
   delete [] histo;
 }
->>>>>>> 4fec25e423493c58fa21cedec161430f90ffc10d