933ffbd83771afc7c9a1dc03f857bce481f8cc2e
dschmelt
  Tue May 26 15:43:44 2020 -0700
Fixing merge conflict CR #25624

diff --git src/hg/htdocs/indexNews.html src/hg/htdocs/indexNews.html
index 4369977..d6ff9fe 100755
--- src/hg/htdocs/indexNews.html
+++ src/hg/htdocs/indexNews.html
@@ -2,34 +2,34 @@
 
   <div class="jwNewsItem jwSingleLineRightColumn">
   __DATE__ -
   <a href="goldenPath/newsarch.html#__MMDDYY__">
     __HEADLINE__
   </a></div>
 
   1. Replace __DATE__ with something like 'Apr. 29, 2016'
   2. Replace __MMDDYY__ with something like '042916'
   3. Replace __HEADLINE__ with the news item's headline like 'Awesome New Feature'
      Be sure to follow the CORRECT STYLE for the headline: 
         - capitalize first letter of headline - no other caps except for proper nouns and acronyms
         - check that headline char count doesn't exceed the line length (otherwise will truncate)
   4. Drop the bottom item from the list (limit of 3 items at a time)
 -->
+  <div class="jwNewsItem jwSingleLineRightColumn">
   May 26, 2020 -
   <a href="goldenPath/newsarch.html#052720">
   New video: Browser Basics, Part 3
->>>>>>> 260c24487a0ce4e3e145687e6a1ba65c812f67d5
   </a></div>
 
   <div class="jwNewsItem jwSingleLineRightColumn">
   May 26, 2020 -
   <a href="goldenPath/newsarch.html#052620">
   NCBI RefSeq vertebrate assembly hubs
   </a></div>
 
   <div class="jwNewsItem jwSingleLineRightColumn">
   May 22, 2020 -
   <a href="goldenPath/newsarch.html#052220">
   Updated GENCODE Genes and GTEx Track
   </a></div>