NNPDF
diff --git a/‎validphys2/src/validphys/tests/baseline/test_dataspecschi2.png‎
2 Bytes b/‎validphys2/src/validphys/tests/baseline/test_dataspecschi2.png‎
2 Bytes
diff --git a/‎validphys2/src/validphys/tests/regressions/test_datasetchi2.csv‎
Lines changed: 3 additions & 9 deletions b/‎validphys2/src/validphys/tests/regressions/test_datasetchi2.csv‎
Lines changed: 3 additions & 9 deletions
@@ -1,12 +1,6 @@
 		test	test
 		ndata	$\chi^2/ndata$
 group	dataset		
-<<<<<<< HEAD
-NMC	NMC	204	1.6064264551629484
-ATLAS	ATLASTTBARTOT	3	1.937726574829856
-CMS	CMSZDIFF12	28	1.8519225479705992
-=======
-NMC	NMC	204	1.5586121921020584
-ATLAS	ATLASTTBARTOT	3	1.1892171212414189
-CMS	CMSZDIFF12	28	1.751072035263169
->>>>>>> d25a7ab66 (update tests)
+NMC	NMC	204	1.6064257972017228
+ATLAS	ATLASTTBARTOT	3	1.9383209541765103
+CMS	CMSZDIFF12	28	1.8520436886594902