remove leftovers from merging

TuringLang · Sep 16, 2024 · 191e534 · 191e534
1 parent 766684f
commit 191e534
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/src/AdvancedVI.jl b/src/AdvancedVI.jl
@@ -170,16 +170,12 @@ Estimate the entropy of `q`.
 """
 function estimate_entropy end
 
-<<<<<<< HEAD
 export
     RepGradELBO,
     ScoreGradELBO,
     ClosedFormEntropy,
     StickingTheLandingEntropy,
     MonteCarloEntropy
-=======
-export RepGradELBO, ClosedFormEntropy, StickingTheLandingEntropy, MonteCarloEntropy
->>>>>>> turing/master
 
 include("objectives/elbo/entropy.jl")
 include("objectives/elbo/repgradelbo.jl")

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -50,13 +50,9 @@ if GROUP == "All" || GROUP == "Interface"
     include("interface/ad.jl")
     include("interface/optimize.jl")
     include("interface/repgradelbo.jl")
-<<<<<<< HEAD
     include("interface/scoregradelbo.jl")
-    include("interface/location_scale.jl")
-=======
     include("interface/rules.jl")
     include("interface/averaging.jl")
->>>>>>> turing/master
 end
 
 if GROUP == "All" || GROUP == "Families"