aws bug fix

Merge branch 'master' of https://github.com/agouy/straf # Conflicts: # server.R
agouy · Feb 2, 2021 · 25fd8d1 · 25fd8d1
2 parents 6503390 + 4804b29
commit 25fd8d1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/server.R b/server.R
@@ -544,7 +544,11 @@ shinyServer(function(input, output) {
       yaxis = list(title = "Locus")
     )
 
+<<<<<<< HEAD
     pdf(NULL)
+=======
+    pdf(tempfile(fileext=".pdf"))
+>>>>>>> 4804b290ae4e763546e7896c69666b2a5a37bbce
     dummy_dev_id = dev.cur()  
     on.exit({
       if (dummy_dev_id %in% dev.list()) {