From 37ff437577608bf2ebefb15086c12d1fb54324fe Mon Sep 17 00:00:00 2001
From: Joshua Lampert <51029046+JoshuaLampert@users.noreply.github.com>
Date: Mon, 10 Feb 2025 14:16:08 +0100
Subject: [PATCH] Fix resolving merge conflict

---
 examples/tree_1d_dgsem/elixir_advection_diffusion.jl         | 4 ----
 examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/examples/tree_1d_dgsem/elixir_advection_diffusion.jl b/examples/tree_1d_dgsem/elixir_advection_diffusion.jl
index 91b797b2b1..ff6447af1b 100644
--- a/examples/tree_1d_dgsem/elixir_advection_diffusion.jl
+++ b/examples/tree_1d_dgsem/elixir_advection_diffusion.jl
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 using OrdinaryDiffEqSDIRK, ADTypes
-=======
-using OrdinaryDiffEq, ADTypes
->>>>>>> main
 using Trixi
 
 ###############################################################################
diff --git a/examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl b/examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl
index d994b0b245..1480691e47 100644
--- a/examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl
+++ b/examples/tree_1d_dgsem/elixir_advection_diffusion_restart.jl
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 using OrdinaryDiffEqSDIRK, ADTypes
-=======
-using OrdinaryDiffEq, ADTypes
->>>>>>> main
 using Trixi
 
 ###############################################################################