Merge conflicts in docs/index.html not completely resolved

[gadenbuie]

It appears that there are still a few lingering merge conflicts in docs/index.html that weren't entirely resolved in 6335193, for example:

shiny.semantic/docs/index.html

Lines 141 to 147 in 0b0b98b

	<<<<<<< HEAD
	<div id="htmlwidget-7c7b572707f4ac03eadc" style="width:100%;height:100px;" class="uirender html-widget"></div>
	<script type="application/json" data-for="htmlwidget-7c7b572707f4ac03eadc">{"x":{"ui":"<div class=\"demo\">\n <div class=\"container-fluid\">\n <div style=\"margin-left: 20px; background: white\">\n <div>\n <div>\n <a>Client's info<\/a>\n <p><\/p>\n <table class = 'table shiny-table table- spacing-s' style = 'width:auto;'>\n<thead> <tr> <th style='text-align: left;'> Name <\/th> <th style='text-align: left;'> City <\/th> <th style='text-align: left;'> Revenue <\/th> <\/tr> <\/thead> <tbody>\n <tr> <td> John Smith <\/td> <td> Warsaw, Poland <\/td> <td> $210.50 <\/td> <\/tr>\n <tr> <td> Lindsay More <\/td> <td> SF, United States <\/td> <td> $172.78 <\/td> <\/tr>\n <\/tbody> <\/table>\n <\/div>\n <\/div>\n <\/div>\n <\/div>\n<\/div>"},"evals":[],"jsHooks":[]}</script>
	=======
	<div id="htmlwidget-dc9d19f95b7f54faecd9" style="width:100%;height:100px;" class="uirender html-widget"></div>
	<script type="application/json" data-for="htmlwidget-dc9d19f95b7f54faecd9">{"x":{"ui":"<div class=\"demo\">\n <div class=\"container-fluid\">\n <div style=\"margin-left: 20px; background: white\">\n <div>\n <div>\n <a>Client's info<\/a>\n <p><\/p>\n <table class = 'table shiny-table table- spacing-s' style = 'width:auto;'>\n<thead> <tr> <th style='text-align: left;'> Name <\/th> <th style='text-align: left;'> City <\/th> <th style='text-align: left;'> Revenue <\/th> <\/tr> <\/thead> <tbody>\n <tr> <td> John Smith <\/td> <td> Warsaw, Poland <\/td> <td> $210.50 <\/td> <\/tr>\n <tr> <td> Lindsay More <\/td> <td> SF, United States <\/td> <td> $172.78 <\/td> <\/tr>\n <\/tbody> <\/table>\n <\/div>\n <\/div>\n <\/div>\n <\/div>\n<\/div>"},"evals":[],"jsHooks":[]}</script>
	>>>>>>> 0c67d5f05901a7385eb7026ca20bd2bfb62df1d6

[dokato]

Thanks @gadenbuie for reporting this. We're on this now #123 ;)