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 @@@ -1,54 -1,54 +1,54 @@@ +