From 801ea0207ca32f094b912b8ac9f22a76271418fd Mon Sep 17 00:00:00 2001
From: Jessica Minnier <jessica.minnier@gmail.com>
Date: Mon, 9 Dec 2019 13:53:24 -0800
Subject: [PATCH] fix merge issues

---
 server-inputdata.R | 13 +------------
 server.R           |  2 +-
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/server-inputdata.R b/server-inputdata.R
index 9a66149..064bf2b 100644
--- a/server-inputdata.R
+++ b/server-inputdata.R
@@ -145,18 +145,7 @@ analyzeDataReactive <-
                       alldata <- inputDataReactive()$data
                       # remove empty columns
                       alldata = alldata %>% remove_empty(which=c("rows","cols"))
-                    validate(not_numeric(alldata))
-                    
-                    }
-                      }
-                        NULL
-                      } else {
-                        FALSE
-                      } else if (input == "") { 
-                        Please check your input file."
-                        "Your data does not appear to be formatted correctly (no numeric columns). 
-                      if(sum(unlist(lapply(input,function(k) class(k)%in%c("numeric","integer"))))==0) {
-                    not_numeric <- function(input) {
+
                     # Check for numeric columns
                       
                       ## ==================================================================================== ##
diff --git a/server.R b/server.R
index a40c0cd..da4aa3e 100644
--- a/server.R
+++ b/server.R
@@ -20,7 +20,7 @@
 
 
 options(shiny.maxRequestSize = 100*1024^2)
-options(repos = BiocInstaller::biocinstallRepos())
+#options(repos = BiocInstaller::biocinstallRepos()) # use setRepositories() 1 2
 
 source("helpers.R")
 print(sessionInfo())