Fix merge related changes

TACC · Dec 18, 2023 · 836f65f · 836f65f
1 parent f984d96
commit 836f65f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - WP-408: use archiveSystemId set in app definition as default (#917)
 
+
 ## [3.4.2] - 2023-12-07: Fix push key handling
 ### Fixed
 

diff --git a/server/portal/urls.py b/server/portal/urls.py
@@ -28,7 +28,6 @@
 from django.urls import path, re_path, include
 from impersonate import views as impersonate_views
 from portal.views.views import health_check
-
 admin.autodiscover()
 
 urlpatterns = [
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

		- WP-408: use archiveSystemId set in app definition as default (#917)


		## [3.4.2] - 2023-12-07: Fix push key handling
		### Fixed

Expand Down