Resolve merge conflict.

cisagov · Mar 6, 2024 · 89fc86d · 89fc86d
2 parents a38ff7a + cc367b8
commit 89fc86d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/backend/src/tasks/checkUserExpiration.ts b/backend/src/tasks/checkUserExpiration.ts
@@ -103,9 +103,7 @@ export const handler: Handler = async (event) => {
         `Password reset for user ${user.id} due to 45 days of inactivity.`
       );
     } catch (passwordError) {
-      console.error(
-        `Error resetting password for user ${user.id}: ${passwordError}`
-      );
+      console.error(`Error resetting password.`);
     }
   }
 

diff --git a/backend/src/tasks/dotgov.ts b/backend/src/tasks/dotgov.ts
@@ -61,6 +61,7 @@ export const handler = async (commandOptions: CommandOptions) => {
   )) {
     // Create a new organization if needed; else, create the same one.
     console.log(orgName);
+    console.log(row);
     const organization =
       (await Organization.findOne({
         name: orgName