unstage the intercept stuff for now

jasp-stats · Feb 7, 2024 · 6aa579a · 6aa579a
1 parent 854ab8a
commit 6aa579a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/inst/qml/ConfirmatoryFactorAnalysis.qml b/inst/qml/ConfirmatoryFactorAnalysis.qml
@@ -79,6 +79,7 @@ Form
 		Group
 		{
 			title: qsTr("Model Options")
+<<<<<<< HEAD
 			CheckBox 
  			{ 
  				label: qsTr("Include mean structure")      ; 
@@ -95,6 +96,9 @@ Form
 
  				}
  			}
+=======
+			CheckBox { label: qsTr("Include mean structure")      ; name: "meanStructure"   ; id: meanstructure }
+>>>>>>> c28a02c (unstage the intercept stuff for now)
 			CheckBox { label: qsTr("Assume factors uncorrelated") ; name: "factorsUncorrelated"    }
 			CheckBox { label: qsTr("Fix exogenous covariates")    ; name: "exogenousCovariatesFixed" ; checked: true ; visible: false }
 			DropDown