fixed merge errors

bcgov · Dec 5, 2024 · 86b970d · 86b970d
1 parent 7fb365c
commit 86b970d
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/backend/src/v1/services/admin-report-service.ts b/backend/src/v1/services/admin-report-service.ts
@@ -246,19 +246,6 @@ const adminReportService = {
     return report;
   },
 
-<<<<<<< Updated upstream
-  async getReportFileName(reportId: string): Promise<string> {
-    const report: Report = await reportService.getReportById(reportId);
-    if (report) {
-      const filename = `pay-transparency-report-${report.reporting_year}-${report.pay_transparency_company.company_name}.pdf`;
-      return filename;
-    } else {
-      throw new Error(`No such report with reportId=${reportId}`);
-    }
-  },
-
-=======
->>>>>>> Stashed changes
   /**
    * Get dashboard metrics
    * @param param0