Skip to content

Commit

Permalink
Fixing rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterMeisrimelModelon committed Feb 29, 2024
1 parent 7f89713 commit 494b9c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/pyfmi/master.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import scipy.optimize as spopt

import pyfmi.fmi as fmi
from pyfmi.common.algorithm_drivers import OptionBase, InvalidAlgorithmOptionException, AssimuloSimResult
from pyfmi.common.io import ResultHandlerFile, ResultHandlerDummy, ResultHandlerBinaryFile
from pyfmi.common.io import get_result_handler
from pyfmi.common.core import TrajectoryLinearInterpolation, TrajectoryUserFunction
from pyfmi.fmi cimport FMUModelCS2
cimport fmil_import as FMIL
Expand Down

0 comments on commit 494b9c4

Please sign in to comment.