From 191e534b1bbfc6f7957ad3fe56da846a9c72213c Mon Sep 17 00:00:00 2001
From: Arnau Quera-Bofarull <arnauq@protonmail.com>
Date: Mon, 16 Sep 2024 12:24:08 +0100
Subject: [PATCH] remove leftovers from merging

---
 src/AdvancedVI.jl | 4 ----
 test/runtests.jl  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/AdvancedVI.jl b/src/AdvancedVI.jl
index 64f3db9c..ca69955b 100644
--- 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
index 7002aafd..2f27459c 100644
--- 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"