From 61eddce4ddf98281f18d64dc16dd0388a666d301 Mon Sep 17 00:00:00 2001 From: jtmst Date: Wed, 18 Dec 2024 10:33:35 -0500 Subject: [PATCH] migration conflict fix --- CHANGELOG.md | 7 ++----- ..._alter_nofo_filename_alter_nofo_inline_css_and_more.py} | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) rename bloom_nofos/nofos/migrations/{0080_alter_nofo_filename_alter_nofo_inline_css_and_more.py => 0081_alter_nofo_filename_alter_nofo_inline_css_and_more.py} (95%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 174ee0b..f84b9bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve - Add cover image for HRSA-25-019 - Add cover image for HHS-2025-ACF-ECD-TH-0106 - Add cover image for HSRA-25-071 +- Add new API endpoints for importing and exporting NOFOs ### Changed @@ -37,11 +38,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve - Loading gif also used on re-import page - bug: since adding replace_links, replace_chars was not being applied -### Migrations - -- Add one new coach ("Sara") and 1 new HRSA designer ("KieuMy") - -## [1.39.0] - 2023-12-04 +## [1.40.0] - 2023-12-04 ### Added diff --git a/bloom_nofos/nofos/migrations/0080_alter_nofo_filename_alter_nofo_inline_css_and_more.py b/bloom_nofos/nofos/migrations/0081_alter_nofo_filename_alter_nofo_inline_css_and_more.py similarity index 95% rename from bloom_nofos/nofos/migrations/0080_alter_nofo_filename_alter_nofo_inline_css_and_more.py rename to bloom_nofos/nofos/migrations/0081_alter_nofo_filename_alter_nofo_inline_css_and_more.py index d4c3c5d..c40fc86 100644 --- a/bloom_nofos/nofos/migrations/0080_alter_nofo_filename_alter_nofo_inline_css_and_more.py +++ b/bloom_nofos/nofos/migrations/0081_alter_nofo_filename_alter_nofo_inline_css_and_more.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("nofos", "0079_cleanup_update_print_logs"), + ("nofos", "0080_alter_nofo_coach_alter_nofo_designer"), ] operations = [