fix merge error

Jonas Jucker · Jonas Jucker · commit 8c67ca188bb1 · 2025-03-26T10:30:48.000+01:00
diff --git a/src/mo_python_output_nc.f90 b/src/mo_python_output_nc.f90
@@ -101,13 +101,10 @@ MODULE mo_python_output_nc
        &    read_netcdf_buffer_ahf, &
   ! isa
        &    read_netcdf_buffer_isa, &
-<<<<<<< HEAD
   ! aot
        &    read_netcdf_buffer_aot, &
-=======
   ! art
        &    read_netcdf_buffer_art
->>>>>>> 81fd839084b1bcc1ac9ce4a1b516921d77c379ed
 
   CONTAINS
 
