Resolve merge conflict error

This commit is contained in:
Nicholas Bauer 2021-09-20 00:30:40 -04:00 committed by GitHub
parent 28dca7f8c6
commit ccb4802678
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -670,7 +670,7 @@ function gr_display(plt::Plot, fmt = "")
end
function gr_set_tickfont(sp, letter)
axis = sp[Symbol(letter, :axis)]
axis = sp[get_attr_symbol(letter, :axis)]
gr_set_font(
tickfont(axis),
sp,