17b98907132a6bf487334f6ed3ae35b9bbe0d08a Merge parents 95b7be2 98af76a dschmelt Fri Oct 25 14:00:40 2019 -0700 Fixing merge conflict diff --cc src/hg/htdocs/indexNews.html index 332bd32,608325a..bd3f135 --- src/hg/htdocs/indexNews.html +++ src/hg/htdocs/indexNews.html @@@ -1,35 -1,33 +1,33 @@@ +