Fix resolving merge conflict

trixi-framework · Feb 10, 2025 · 37ff437 · 37ff437
1 parent 672e9e8
commit 37ff437
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git 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
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 using OrdinaryDiffEqSDIRK, ADTypes
-=======
-using OrdinaryDiffEq, ADTypes
->>>>>>> main
 using Trixi
 
 ###############################################################################