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
@@@ -2,34 -2,32 +2,32 @@@
  
    <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">
+   Oct. 25, 2019 -
+   <a href="goldenPath/newsarch.html#102519">
+   New Illumina Global Diversity Array for human (GRChg37/hg19)
+   </a></div>
  
    <div class="jwNewsItem jwSingleLineRightColumn">
 -  Oct. 24, 2019 -
 -  <a href="goldenPath/newsarch.html#102419">
 -  Hi-C heatmap visualizations; Platinum VCFs
 +  Oct. 25, 2019 -
 +  <a href="goldenPath/newsarch.html#102519">
 +  Hi-C heatmap visualizations
    </a></div>
  
    <div class="jwNewsItem jwSingleLineRightColumn">
 -  Oct. 16, 2019 -
 -  <a href="goldenPath/newsarch.html#101619">
 -  New GENCODE Genes tracks for human (V32) and mouse (VM23)
 +  Oct. 24, 2019 -
 +  <a href="goldenPath/newsarch.html#102419">
 +  Platinum genomes VCFs
    </a></div>
- 
-  <div class="jwNewsItem jwSingleLineRightColumn">
-   Oct. 16, 2019 -
-   <a href="goldenPath/newsarch.html#101619">
-   New GENCODE Genes tracks for human (V32) and mouse (VM23)
-   </a></div>
-