From c7d28a599b08e8fd984e624fc495b227cc152b42 Mon Sep 17 00:00:00 2001
From: Zaher Salman <zaher.salman@psi.ch>
Date: Wed, 4 Apr 2018 09:55:14 +0200
Subject: [PATCH] Correction due to merge.

---
 src/external/MuSRFitGUI/MSR.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/external/MuSRFitGUI/MSR.pm b/src/external/MuSRFitGUI/MSR.pm
index f2a3adfe..87b4d120 100644
--- a/src/external/MuSRFitGUI/MSR.pm
+++ b/src/external/MuSRFitGUI/MSR.pm
@@ -278,7 +278,6 @@ sub CreateMSRUni {
 		}
 		if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) {
 		    $Data_Line =$Data_Line."    ".$All{"Data1$NHist"}."    ".$All{"Data2$NHist"};
-<<<<<<< HEAD
 		}
 		if ($All{"t0$NHist"} ne $EMPTY) {
 		    $T0_Line=$T0_Line."      ".$All{"t0$NHist"};