mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflict relicts

Browse Source
This commit is contained in:
Daniel Schwabeneder 2018-08-08 09:24:37 +02:00
parent a3f1950a18
commit cd770f70c0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/output.jl
View File

@ -254,7 +254,6 @@ end
# end # end
# #
# html_output_format("svg") # html_output_format("svg")
<<<<<<< HEAD
# --------------------------------------------------------- # ---------------------------------------------------------
@ -279,5 +278,3 @@ function showjuno(io::IO, m, plt)
plt[:dpi] = dpi plt[:dpi] = dpi
plt[:thickness_scaling] = thickness_scaling plt[:thickness_scaling] = thickness_scaling
end end
=======
>>>>>>> 85b3aefd677c8c3adf6797cb2d85c1249cf631b8