87b7884a455030761304f18056a4e8a265b8cfaa
Merge parents 79e1e2a 953048f
kate
  Fri Jan 8 09:35:47 2021 -0800
Resolving merge conflict

diff --cc src/hg/inc/hui.h
index 61ffd69,f7fcb98..ad29701
--- src/hg/inc/hui.h
+++ src/hg/inc/hui.h
@@@ -146,38 -146,33 +146,37 @@@
  /* SwitchGear TSS default filter. */
  #define SWITCHDBTSS_FILTER 10
  
  /* Subtrack color support in UI */
  #define SUBTRACK_COLOR_PATCH    "showSubtrackColorOnUi"
  // for use with subGroup and sortOrder settings
  // ie. subGroup1 subtrackColor Color; sortOrder subtrackColor=+ cellType=+
  #define SUBTRACK_COLOR_SUBGROUP "subtrackColor"
  
  // trackDb setting and cart/cgi var
  #define SUBTRACK_HIDE_EMPTY       "hideEmptySubtracks"
  #define SUBTRACK_HIDE_EMPTY_LABEL "hideEmptySubtracksLabel"
  #define SUBTRACK_HIDE_EMPTY_MULTIBED_URL       "hideEmptySubtracksMultiBedUrl"
  #define SUBTRACK_HIDE_EMPTY_SOURCES_URL        "hideEmptySubtracksSourcesUrl"
  
- 
 +// multi-region 
  #define MULTI_REGION_CHROM      "multi"
  #define OLD_MULTI_REGION_CHROM  "virt"
  
 +#define MULTI_REGION_BED_URL    "multiRegionBedUrl"
 +#define MULTI_REGION_BED_PADDING    "multiRegionBedPadding"
 + 
  void netUi(struct trackDb *tdb);
  
  struct controlGrid
  /* Keep track of a control grid (table) */
      {
      int columns;	/* How many columns in grid. */
      int columnIx;	/* Index (0 based) of current column. */
      char *align;	/* Which way to align. */
      boolean rowOpen;	/* True if have opened a row. */
      };
  
  struct controlGrid *startControlGrid(int columns, char *align);
  /* Start up a control grid. */
  
  void controlGridStartCell(struct controlGrid *cg);