759a03dbb28ca4d6a73e0e5c1c250d9473e0f13f
jcasper
  Sun May 7 01:11:21 2023 -0700
Installing updated hg.conf files from UCSC servers

diff --git confs/rr.hg.conf confs/rr.hg.conf
index 03ecd38..ea44318 100644
--- confs/rr.hg.conf
+++ confs/rr.hg.conf
@@ -183,15 +183,21 @@
 
 # with wildcard for testing:
 #httpsCertCheckDomainExceptions=noHardwiredExceptions *.upf.edu *.igh.cnrs.fr *.med.umich.edu
 
 # Assembly-specific html (e.g. links to more info)
 GCA_009914755.4_html=<b><a target=_blank style='font-size:small; position: absolute; margin-left: 1em' href='/goldenPath/newsarch.html#041222'>What is human CHM13-T2T?</a></b>
 
 # Adding parallel loading on files from /gbdb, refs #29819
 udc.localDir=/gbdb
 
 # Adding curated hubs line by request from Jairo 09/26/22
 curatedHubPrefix=public
 
 # show the hgTracks download track data in window interface popup
 showDownloadUi=on
+
+# allows merging of carts - needed so that recommended track sets do not overwrite your own custom data #28525. Note to delete in future as we want this default
+mergeRecommended=on
+
+# show a message when hgTracks takes longer than X seconds to load
+warnSeconds=40