95efc27edf24bba8d0c7e53d2ef4aead59982826
braney
  Mon Jun 15 18:29:39 2020 -0700
Merging in our gencode merge code to master branch

diff --git src/hg/makefile src/hg/makefile
index 1e06258..bd9d739 100644
--- src/hg/makefile
+++ src/hg/makefile
@@ -1,24 +1,24 @@
 # Build all directories in utils
 
 kentSrc = ..
 include ${kentSrc}/inc/localEnvironment.mk
 
 # 	$Id: makefile,v 1.156 2010/03/03 02:53:30 markd Exp $
 
 BROWSER_BINS=cartReset das hgBlat makeDb/hgCgiData hgCollection hgConvert \
-	hgHubConnect hgGateway hgGene hgGenome hgIntegrator hgLogin hgPcr \
+	hgHubConnect hgGateway hgGene hgGene2 hgGenome hgIntegrator hgLogin hgPcr \
 	hgSession hgSuggest hgTables hgTracks hgTrackUi hgUserSuggestion \
 	hgc hgApi cartDump near/hgNear hgLiftOver hgLinkIn hgVai \
 	visiGene/hgVisiGene hgMenubar hgPublicSessions \
 	encode/hgEncodeDataVersions encode/hgEncodeVocab encode/hgEncodeApi \
 	phyloPng hgCustom hgPal hgFileUi hgFileSearch makeDb/hgCgiData \
 	js htdocs/style hgMirror hgBeacon hgGtexTrackSettings pyLib \
 	hgGeneGraph hgs hubApi
 
 ifdef LOWELAB
     BROWSER_BINS += $(HOME)/lowelab/src/browser/tooltip $(HOME)/lowelab/src/browser/chooseorg
 endif
 
 BROWSER_LOADERS = makeDb/hgLoadBed makeDb/hgLoadWiggle makeDb/hgLoadMaf utils/pslToBigPsl utils/hubCheck
 
 ifneq ($(findstring $(shell hostname),hgwdev hgwbeta),)