File Changes for ann

v331_preview to v331_preview2 (2016-03-28 to 2016-04-04) v331

• src/hg/htdocs/goldenPath/newsarch.html
  • lines changed 24407, context: html, text, full: html, text
    trying to fix merge conflict
    
• src/hg/htdocs/indexNews.bak.html
  • lines changed 221, context: html, text, full: html, text
    trying to fix merge conflict
    
• src/hg/htdocs/indexNews.html
  • lines changed 50, context: html, text, full: html, text
    4/1 joke!
    
  • lines changed 421, context: html, text, full: html, text
    trying to fix merge conflict
    
• src/hg/htdocs/training/index.html
  • lines changed 296, context: html, text, full: html, text
    trying to fix merge conflict
    
• src/hg/htdocs/training/vids/index.html
  • lines changed 708, context: html, text, full: html, text
    trying to fix merge conflict