fix(merge): resolve merge conflict

src/types/api/production/chickin.d.ts

@@ -0,0 +1,20 @@
+import { BaseMetadata } from "@/types/api/api-general";
+import { ProjectFlockKandang } from "@/types/api/production/project-flock-kandang";
+
+export type BaseChickin = {
+  id?: number;
+  chick_in_date?: string;
+  quantity?: number;
+  note?: string;
+  project_flock_kandang?: ProjectFlockKandang;
+}
+
+export type Chickin = BaseMetadata & BaseChickin;
+
+export type CreateChickinPayload = {
+  project_flock_kandang_id: number;
+  chick_in_date: string;
+}
+
+export type UpdateChickinPayload = CreateChickinPayload;
+

src/types/api/production/project-flock-kandang.d.ts

@@ -0,0 +1,12 @@
+import { Kandang } from "@/type/master-data/kandang";
+import { ProjectFlock } from "@/types/api/production/project-flock";
+
+export type BaseProjectFlockKandang = {
+  id: number;
+  project_flock_id: number;
+  kandang_id: number;
+  kandang: Kandang;
+  project_flock: ProjectFlock;
+}
+
+export type ProjectFlockKandang = BaseProjectFlockKandang;