LMU/musrfit
5
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

Fix merge conflic manually

Browse Source
This commit is contained in:
salman
2018-03-27 22:51:09 +02:00
parent beab905ecd f843d61bbb
commit 02b05825b2
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/external/MuSRFitGUI/MSR.pm vendored
View File

@@ -278,6 +278,7 @@ 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"};
@@ -1262,7 +1263,6 @@ sub ExportParams {
push( @FitTypes, $All{"FitType$i"} );
}
}
# Get theory block to determine the size of the table
my ($Full_T_Block,$Paramcomp_ref)= MSR::CreateTheory(@FitTypes);
# For now the line below does not work. Why?