Remove stray merge conflict marker from HISTORY.md

Author: anurag-mds

HISTORY.md

@@ -1,11 +1,10 @@
-
 # 0.41
 
 Removed `LogDensityFunctionWrapper` and `VarInfo(::MarginalLogDensity, ...)`
 from the MarginalLogDensities extension. Users should now use
 `DynamicPPL.InitFromVector(mld, ...)` to obtain an initialisation strategy
 and pass it to `init!!` to get a consistent `VarInfo`.
-=======
+
 # 0.40.15
 
 DynamicPPL now allows you to set the type that log-probabilities are initialised with, using the `DynamicPPL.set_logprob_type!` function.

docs/src/api.md

@@ -173,7 +173,7 @@ A `MarginalLogDensity` object acts as a function which maps non-marginalised par
 To obtain an initialisation strategy reflecting the state of the marginalisation, you can use:
 
 ```@docs
-InitFromVector(::MarginalLogDensities.MarginalLogDensity{<:DynamicPPL.LogDensityFunction}, ::Union{AbstractVector,Nothing})
+InitFromVector(::MarginalLogDensities.MarginalLogDensity, ::Union{AbstractVector,Nothing})
 ```
 
 ## Models within models