From 28dca7f8c643ea5cf7a6243fd2273ccb6dbb8c9a Mon Sep 17 00:00:00 2001 From: Nicholas Bauer Date: Mon, 20 Sep 2021 00:29:07 -0400 Subject: [PATCH] Resolve merge conflict error. --- src/backends/gr.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backends/gr.jl b/src/backends/gr.jl index 397ea80c..6403e15f 100644 --- a/src/backends/gr.jl +++ b/src/backends/gr.jl @@ -2114,4 +2114,5 @@ function _display(plt::Plot{GRBackend}) end end -closeall(::GRBackend) = GR.emergencyclosegks() \ No newline at end of file +closeall(::GRBackend) = GR.emergencyclosegks() +