resovle conflict

Merge branch 'master' of https://github.com/womeimingzi11/moreThanANOVA # Conflicts: # moreThanANOVA.Rproj # ui.R
zhunianfu · Aug 21, 2021 · 8ca45b6 · 8ca45b6
2 parents ec7c332 + 63490dc
commit 8ca45b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/moreThanANOVA.Rproj b/moreThanANOVA.Rproj
@@ -12,4 +12,4 @@ Encoding: UTF-8
 RnwWeave: Sweave
 LaTeX: XeLaTeX
 
-LineEndingConversion: Posix
+LineEndingConversion: Posix
diff --git a/ui.R b/ui.R
@@ -1,4 +1,3 @@
-#
 # This is a Shiny web application. You can run the application by clicking
 # the 'Run App' button above.
 #
@@ -91,16 +90,11 @@ ui <- fluidPage(
                                'ToothGrowth (Demo2)' = 'demo-tooth'),
                    selected = 'demo-tooth'
                  ),
-                 conditionalPanel(
-                   condition = "input.data_source == 'file'",
-                   fileInput('df_upload_file',
-                             'Please upload your data')
-                 ),
                  helpText(
                    a(href = "https://archive.ics.uci.edu/ml/datasets/iris", "Iris Data Set"),
                    tags$br(),
                    a(href = "https://academic.oup.com/jn/article-abstract/33/5/491/4726758?redirectedFrom=fulltext", "ToothGrowth Data Set")
-                 ),
+                   ),
                  conditionalPanel(
                    condition = "input.data_source == 'file'",
                    fileInput('df_upload_file',
@@ -317,4 +311,4 @@ ui <- fluidPage(
       includeMarkdown('resource/page/acknowledgements.md')
     )
   )
-)
+  )