9fc19d1c120f23370047d73268806e2fa019811a Merge parents 73365345ad5 b88a0d542ed mspeir Tue Feb 25 08:10:50 2025 -0800 resolving merge conflict in indexNews and newsarch files diff --cc src/hg/htdocs/indexNews.html index a2282cf01f7,49f99b70eab..24d79194f51 --- src/hg/htdocs/indexNews.html +++ src/hg/htdocs/indexNews.html @@@ -5,50 -5,50 +5,50 @@@ __HEADLINE__ 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) - approx 50 characters 4. Drop the bottom item from the list (limit of 6 items at a time) | <- Cutoff point --> +