Resolve merge conflict error
This commit is contained in:
parent
28dca7f8c6
commit
ccb4802678
@ -670,7 +670,7 @@ function gr_display(plt::Plot, fmt = "")
|
|||||||
end
|
end
|
||||||
|
|
||||||
function gr_set_tickfont(sp, letter)
|
function gr_set_tickfont(sp, letter)
|
||||||
axis = sp[Symbol(letter, :axis)]
|
axis = sp[get_attr_symbol(letter, :axis)]
|
||||||
gr_set_font(
|
gr_set_font(
|
||||||
tickfont(axis),
|
tickfont(axis),
|
||||||
sp,
|
sp,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user