fix: resolve merge conflicts

e-picsa · Mar 1, 2024 · c7fafc7 · c7fafc7
1 parent b6157aa
commit c7fafc7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/apps/picsa-apps/dashboard/src/app/app.component.ts b/apps/picsa-apps/dashboard/src/app/app.component.ts
@@ -7,12 +7,6 @@ import { DASHBOARD_NAV_LINKS, INavLink } from './data';
 import { DashboardMaterialModule } from './material.module';
 import { DeploymentSelectComponent } from './modules/deployment/components';
 
-interface INavLink {
-  label: string;
-  href: string;
-  isActive?: boolean;
-}
-
 @Component({
   standalone: true,
   imports: [RouterModule, DashboardMaterialModule, DeploymentSelectComponent, CommonModule],

diff --git a/apps/picsa-apps/dashboard/src/app/modules/crop-information/crop-information.service.ts b/apps/picsa-apps/dashboard/src/app/modules/crop-information/crop-information.service.ts
@@ -5,7 +5,7 @@ import { PicsaAsyncService } from '@picsa/shared/services/asyncService.service';
 import { SupabaseService } from '@picsa/shared/services/core/supabase';
 import { IStorageEntry } from '@picsa/shared/services/core/supabase/services/supabase-storage.service';
 
-export type ICropInformationRow = Database['public']['Tables']['crop_data']['Row'];
+export type ICropInformationRow = Database['public']['Tables']['climate_station_crop_data']['Row'];
 
 export interface IResourceStorageEntry extends IStorageEntry {
   /** Url generated when upload to public bucket (will always be populated, even if bucket not public) */