mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-02-06 03:13:42 -05:00
Resolved conflicts by: - Taking all backstop images from main branch - Taking .ds.baseline from main (with updated line numbers) - Keeping template literal security fixes in listEntry.js while incorporating main's styling changes - Taking main's config.py updates (LOGO_CDN_DOMAIN and formatting)