migration conflict fix

HHS · Dec 18, 2024 · 61eddce · 61eddce
1 parent c47b03c
commit 61eddce
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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/...ilename_alter_nofo_inline_css_and_more.py → ...ilename_alter_nofo_inline_css_and_more.py b/...ilename_alter_nofo_inline_css_and_more.py → ...ilename_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 = [