Fix files.iss after 9554001 [simulated_annealing => optim] 76/21376/1
Samuel GOUGEON [Thu, 20 Feb 2020 22:28:23 +0000 (23:28 +0100)]
Change-Id: I98f7c36eb607c58fd272aa9867e39452a4391b28

scilab/tools/innosetup/files.iss

index 0af004c..17e13a5 100644 (file)
 #include BinariesSourcePath + "\modules\spreadsheet\spreadsheet.iss"
 #include BinariesSourcePath + "\modules\differential_equations\differential_equations.iss"
 #include BinariesSourcePath + "\modules\development_tools\development_tools.iss"
-<<<<<<< HEAD
-#include BinariesSourcePath + "\modules\simulated_annealing\simulated_annealing.iss"
-=======
-#include BinariesSourcePath + "\modules\genetic_algorithms\genetic_algorithms.iss"
->>>>>>> 3941781e44f... * Bug 14734 fixed: [simulated_annealing] merged in [optimization]
 #include BinariesSourcePath + "\modules\parameters\parameters.iss"
 #include BinariesSourcePath + "\modules\matio\matio.iss"
 #include BinariesSourcePath + "\modules\call_scilab\call_scilab.iss"