|
@@ -1,16 +1,3 @@
|
|
|
-<<<<<<< HEAD
|
|
|
|
|
-ID_offspring,line_name,date_of_birth,ID_father_1,ID_mother_1,sacrifice_reason,n_mutations,mutations,genotype_offspring,genotype_father,genotype_mother
|
|
|
|
|
-ID-001,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_hom,hom_het,wt_hom
|
|
|
|
|
-ID-006,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_hom,hom_het,wt_hom
|
|
|
|
|
-ID-007,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_hom,hom_het,wt_hom
|
|
|
|
|
-ID-008,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_het,het_het,het_het
|
|
|
|
|
-ID-009,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_het,het_het,het_het
|
|
|
|
|
-ID-011,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_wt,het_het,het_het
|
|
|
|
|
-ID-012,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,,hom_het,wt_hom
|
|
|
|
|
-ID-013,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,,wt_wt,wt_wt
|
|
|
|
|
-ID-014,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,,hom_het,wt_hom
|
|
|
|
|
-ID-015,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A_Mut-B,het_hom,hom_het,wt_hom
|
|
|
|
|
-=======
|
|
|
|
|
ID_offspring,line_name,date_of_birth,ID_father_1,ID_mother_1,sacrifice_reason,n_mutations,mutation_1,mutation_2,genotype_offspring,genotype_father,genotype_mother
|
|
ID_offspring,line_name,date_of_birth,ID_father_1,ID_mother_1,sacrifice_reason,n_mutations,mutation_1,mutation_2,genotype_offspring,genotype_father,genotype_mother
|
|
|
ID-001,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,het_hom,hom_het,wt_hom
|
|
ID-001,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,het_hom,hom_het,wt_hom
|
|
|
ID-006,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,het_hom,hom_het,wt_hom
|
|
ID-006,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,het_hom,hom_het,wt_hom
|
|
@@ -21,4 +8,3 @@ ID-011,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,het_wt,het
|
|
|
ID-012,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,hom_het,wt_hom
|
|
ID-012,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,hom_het,wt_hom
|
|
|
ID-013,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,wt_wt,wt_wt
|
|
ID-013,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,wt_wt,wt_wt
|
|
|
ID-014,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,hom_het,wt_hom
|
|
ID-014,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,2,Mut-A,Mut-B,,hom_het,wt_hom
|
|
|
->>>>>>> master
|
|
|