5e84c54c00824bb9ddacfd439db694906328fc61
Merge parents 5e5b469 f42dec5
kate
  Tue Nov 24 09:55:57 2015 -0800
Fix merge conflict

diff --cc src/hg/inc/gtexUi.h
index d4f68f3,daaf71a..b71f7e2
--- src/hg/inc/gtexUi.h
+++ src/hg/inc/gtexUi.h
@@@ -1,49 -1,46 +1,49 @@@
  /* gtexUi - GTEx (Genotype Tissue Expression) tracks */
  
  /* Copyright (C) 2015 The Regents of the University of California 
   * See README in this or parent directory for licensing information. */
  #ifndef GTEXUI_H
  #define GTEXUI_H
  
  /* Color scheme */
  #define GTEX_COLORS                     "colorScheme"
  #define GTEX_COLORS_RAINBOW             "rainbow"
  
  /* Color scheme from GTEX papers and portal */
  #define GTEX_COLORS_GTEX                "gtex"
  #define GTEX_COLORS_DEFAULT             GTEX_COLORS_GTEX
  
  /* Data transform */
  #define GTEX_LOG_TRANSFORM              "logTransform"
  #define GTEX_LOG_TRANSFORM_DEFAULT      TRUE
  
  /* Viewing limits */
  #define GTEX_MAX_LIMIT                  "maxLimit"
  #define GTEX_MAX_LIMIT_DEFAULT          300
  /* TODO: Get default from gtexInfo table */
  
  /* Sample selection and comparison */
  #define GTEX_SAMPLES                    "samples"
  #define GTEX_SAMPLES_ALL                "all"
  #define GTEX_SAMPLES_COMPARE_SEX        "sex"
  #define GTEX_SAMPLES_DEFAULT            GTEX_SAMPLES_ALL
  
  #define GTEX_SAMPLES_COMPARE_AGE        "age"
  #define GTEX_COMPARE_AGE_YEARS          "years"
  #define GTEX_COMPARE_AGE_DEFAULT        50
  
  #define GTEX_COMPARISON_DISPLAY         "comparison"
  #define GTEX_COMPARISON_MIRROR          "mirror"
  #define GTEX_COMPARISON_DIFF            "difference"
- #define GTEX_COMPARISON_DEFAULT         GTEX_COMPARISON_MIRROR
+ #define GTEX_COMPARISON_DEFAULT         GTEX_COMPARISON_DIFF
  
  /* Graph type */
  #define GTEX_GRAPH              "graphType"
  #define GTEX_GRAPH_RAW          "raw"
  #define GTEX_GRAPH_NORMAL       "normalized"
  #define GTEX_GRAPH_DEFAULT      GTEX_GRAPH_RAW
  
 +/* Tissue filter */
 +#define GTEX_TISSUE_SELECT      "tissues"
 +
  #endif /* GTEXUI_H */