Merge remote-tracking branch 'origin/master'

Conflicts:
	shiny-app/server.R
This commit is contained in:
Aron Lindberg
2015-11-07 15:18:52 -05:00
2 changed files with 5 additions and 1 deletions

View File

@ -16,7 +16,8 @@ shinyUI(fluidPage(
id = 'dataset',
tabPanel('emergency2013', dataTableOutput('mytable1')),
tabPanel('emergency2013', dataTableOutput('mytable2')),
tabPanel('emergency2013', plotOutput('myplot'))))
tabPanel('emergency2013', plotOutput('myplot')))
)
)
)
)