Remove git rebase leftover

[cmower]

See

optas/optas/models.py

Lines 203 to 221 in ef18f1e

	"""! 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
	"""