From 836f65f974b15268c6a4d5d25e00a5c98ceb079c Mon Sep 17 00:00:00 2001
From: Chandra Y <cyemparala@tacc.utexas.edu>
Date: Sun, 17 Dec 2023 21:05:50 -0600
Subject: [PATCH] Fix merge related changes

---
 CHANGELOG.md          | 1 +
 server/portal/urls.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd26362f0d..9e594b724a 100644
--- 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
index 2283b26f94..f19e911660 100644
--- 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 = [