221c807e7b59d1a5cb7cd9105c923320e72346a0
Merge parents 4c11eb65296 d9e0b9cd466
gperez2
  Tue Apr 29 17:33:11 2025 -0700
Updaing makefile to resolve merge conflict, refs #34938

diff --cc src/hg/js/tutorials/makefile
index e648202629e,a27aeae7b56..5ac35780020
--- src/hg/js/tutorials/makefile
+++ src/hg/js/tutorials/makefile
@@@ -1,14 -1,14 +1,14 @@@
  kentSrc = ../../..
  include ../../../inc/common.mk
  include ../install.mk
  
- SYMLINKED_FILES=basicTutorial.js clinicalTutorial.js hgTracksPopup.js gatewayTutorial.js
 -SYMLINKED_FILES=basicTutorial.js clinicalTutorial.js hgTracksPopup.js tableBrowserTutorial.js
++SYMLINKED_FILES=basicTutorial.js clinicalTutorial.js hgTracksPopup.js tableBrowserTutorial.js gatewayTutorial.js
  
  doInstall:
  	@mkdir -p ${DEST}/
  	../../utils/cpAndLinkToResourceFiles.pl ${extra} -exclude='makefile' \
  			-versionFile=../../inc/versionInfo.h -destDir=${DEST} ${SYMLINKED_FILES}
  # Left this here in case we have static tutorial files in the future
  #	for file in ${STATIC_FILES}; do \
  #	    rsync -a $$file ${DEST}/; \
  #	done