fix

JuliaPlots · Jul 18, 2024 · 88628e4 · 88628e4
1 parent e0f0abd
commit 88628e4
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/PlotsBase/src/Commons/attrs.jl b/PlotsBase/src/Commons/attrs.jl
@@ -1157,11 +1157,7 @@ label_to_string(label::Nothing, series_plotindex) = ""
 label_to_string(label::Missing, series_plotindex) = ""
 label_to_string(label::Symbol, series_plotindex) =
     if label ≡ :auto
-<<<<<<< HEAD
         string("y", series_plotindex)
-=======
-        return label_auto(series_plotindex)
->>>>>>> d6b3aaf8 (safe-saving arg)
     elseif label ≡ :none
         ""
     else