Correction due to merge.
This commit is contained in:
1
src/external/MuSRFitGUI/MSR.pm
vendored
1
src/external/MuSRFitGUI/MSR.pm
vendored
@ -278,7 +278,6 @@ sub CreateMSRUni {
|
|||||||
}
|
}
|
||||||
if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) {
|
if ($All{"Data1$NHist"} ne $EMPTY && $All{"Data2$NHist"} ne $EMPTY) {
|
||||||
$Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"};
|
$Data_Line =$Data_Line." ".$All{"Data1$NHist"}." ".$All{"Data2$NHist"};
|
||||||
<<<<<<< HEAD
|
|
||||||
}
|
}
|
||||||
if ($All{"t0$NHist"} ne $EMPTY) {
|
if ($All{"t0$NHist"} ne $EMPTY) {
|
||||||
$T0_Line=$T0_Line." ".$All{"t0$NHist"};
|
$T0_Line=$T0_Line." ".$All{"t0$NHist"};
|
||||||
|
Reference in New Issue
Block a user