ba8d45a98b6ae5f73493192b0eb0767dbb4f4dd8
Merge parents 5ccbeee a6f9e0e
kate
  Thu Apr 13 14:49:10 2017 -0700
Fixing merge conflict

diff --cc src/hg/lib/hui.c
index 3bc4444,cf129fd..b643e73
--- src/hg/lib/hui.c
+++ src/hg/lib/hui.c
@@@ -35,31 -35,31 +35,32 @@@
  #include "snakeUi.h"
  #include "vcfUi.h"
  #include "vcf.h"
  #include "errCatch.h"
  #include "samAlignment.h"
  #include "makeItemsItem.h"
  #include "bedDetail.h"
  #include "pgSnp.h"
  #include "memgfx.h"
  #include "trackHub.h"
  #include "gtexUi.h"
  #include "genbank.h"
  #include "htmlPage.h"
  #include "longRange.h"
  #include "tagRepo.h"
 +#include "fieldedTable.h"
+ #include "barChartUi.h"
  
  #define SMALLBUF 256
  #define MAX_SUBGROUP 9
  #define ADD_BUTTON_LABEL        "add"
  #define CLEAR_BUTTON_LABEL      "clear"
  #define JBUFSIZE 2048
  
  
  #define DEF_BUTTON "<IMG id=\"btn_%s\" src=\"../images/%s\" alt=\"%s\">\n"
  #define DEF_BUTTON_JS "setCheckBoxesThatContain('%s',true,false,'%s','','%s');" \
  	       "setCheckBoxesThatContain('%s',false,false,'%s','_defOff','%s');" 
  #define DEFAULT_BUTTON(nameOrId,anc,beg,contains) \
      printf(DEF_BUTTON,(anc),"defaults_sm.png","default"); \
      safef(id, sizeof id, "btn_%s", (anc)); \
      jsOnEventByIdF("click", id, DEF_BUTTON_JS,(nameOrId),(beg),(contains),(nameOrId),(beg),(contains));