Jerome · Jerome · commit 7b9638669bc7 · 2021-07-26T14:05:05.000+02:00
[fix] merge line forgotten in cameracalibration project.
diff --git a/tests/SolARTest_ModuleOpenCV_CameraCalibration/SolARTest_ModuleOpenCV_CameraCalibration.pro b/tests/SolARTest_ModuleOpenCV_CameraCalibration/SolARTest_ModuleOpenCV_CameraCalibration.pro
@@ -75,7 +75,6 @@ android {
     ANDROID_ABIS="arm64-v8a"
 }
 
-<<<<<<< HEAD
 linux {
   run_install.path = $${TARGETDEPLOYDIR}
   run_install.files = $${PWD}/../run.sh

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ android {`
`75`	`75`	`ANDROID_ABIS="arm64-v8a"`
`76`	`76`	`}`
`77`	`77`
`78`		`-<<<<<<< HEAD`
`79`	`78`	`linux {`
`80`	`79`	`run_install.path = $${TARGETDEPLOYDIR}`
`81`	`80`	`run_install.files = $${PWD}/../run.sh`