From 2c43249e9864eab879528a1023d3ec00c35a6f75 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Thu, 24 Mar 2022 07:25:10 +1000
Subject: [PATCH] Restore order of ngModule imports (#1560)

---
 bitwarden_license/src/app/app.module.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bitwarden_license/src/app/app.module.ts b/bitwarden_license/src/app/app.module.ts
index 9e0de2af9c..781e3f450f 100644
--- a/bitwarden_license/src/app/app.module.ts
+++ b/bitwarden_license/src/app/app.module.ts
@@ -19,17 +19,17 @@ import { MaximumVaultTimeoutPolicyComponent } from "./policies/maximum-vault-tim
 
 @NgModule({
   imports: [
-    AppRoutingModule,
-    BrowserAnimationsModule,
-    DragDropModule,
-    FormsModule,
-    InfiniteScrollModule,
     JslibModule,
-    OrganizationsModule,
-    OssRoutingModule,
+    BrowserAnimationsModule,
+    FormsModule,
     ReactiveFormsModule,
-    RouterModule,
     ServicesModule,
+    InfiniteScrollModule,
+    DragDropModule,
+    AppRoutingModule,
+    OssRoutingModule,
+    OrganizationsModule, // Must be after OssRoutingModule for competing routes to resolve properly
+    RouterModule,
     WildcardRoutingModule, // Needs to be last to catch all non-existing routes
   ],
   declarations: [