e9ed25747e3d8ab10963306b826f7cedc5e71897
Merge parents b18f2f9facb 992aeef92fe
braney
  Mon Sep 7 11:35:30 2026 -0700
Merge branch 'quickLiftAlign38249' -- alignment tracks in quickLift, refs #38249

# Conflicts:
#       src/hg/lib/trackHub.c

diff --cc src/hg/hgc/hgc.c
index c0caf9e6b10,d78eb59dd1f..8e77cb226f4
--- src/hg/hgc/hgc.c
+++ src/hg/hgc/hgc.c
@@@ -132,34 -132,34 +132,35 @@@
  #include "genomicSuperDups.h"
  #include "celeraDupPositive.h"
  #include "celeraCoverage.h"
  #include "sample.h"
  #include "axt.h"
  #include "axtInfo.h"
  #include "jaxQTL.h"
  #include "jaxQTL3.h"
  #include "wgRna.h"
  #include "ncRna.h"
  #include "gbProtAnn.h"
  #include "hgSeq.h"
  #include "chain.h"
  #include "chainDb.h"
  #include "chainNetDbLoad.h"
+ #include "bigChain.h"
  #include "chainToPsl.h"
  #include "chainToAxt.h"
  #include "netAlign.h"
 +#include "bigNet.h"
  #include "stsMapRat.h"
  #include "stsInfoRat.h"
  #include "stsMapMouseNew.h"
  #include "stsInfoMouseNew.h"
  #include "vegaInfo.h"
  #include "vegaInfoZfish.h"
  #include "ensInfo.h"
  #include "scoredRef.h"
  #include "blastTab.h"
  #include "hdb.h"
  #include "hgc.h"
  #include "genbank.h"
  #include "pseudoGeneLink.h"
  #include "axtLib.h"
  #include "ensFace.h"