Merge pull request #152 from cmower/fix-150

Fixes #150

optas/models.py

@@ -202,22 +202,13 @@ def __init__(
     ):
         """! Task model initializer.
 
-<<<<<<< HEAD
         @param name The name of the model.
         @param dim Model dimension.
         @param time_derivs Time derivatives required for model, 0 means not time derivative, 1 means first derivative wrt to time is required, etc.
         @param symbol A short symbol to represent the model.
         @param dlim Limits on each time derivative, index should correspond to a time derivative (i.e. 0, 1, ...) and the value should be a tuple of two lists containing the lower and upper bounds.
         @param T Optionally use this to override the number of time-steps given in the OptimizationBuilder constructor.
-=======
-@param name The name of the model.
-@param dim Model dimension.
-@param time_derivs Time derivatives required for model, 0 means not time derivative, 1 means first derivative wrt to time is required, etc.
-@param symbol A short symbol to represent the model.
-@param dlim Limits on each time derivative, index should correspond to a time derivative (i.e. 0, 1, ...) and the value should be a tuple of two lists containing the lower and upper bounds.
-@param T Optionally use this to override the number of time-steps given in the OptimizationBuilder constructor.
-@param is_discrete When True, the variables are treated as discrete variables.
->>>>>>> Add is_discrete attribute for task model
+        @param is_discrete When True, the variables are treated as discrete variables.
         """
 
         super().__init__(name, dim, time_derivs, symbol, dlim, T)