Ver código fonte

merge with master

Henry Crosswell 3 semanas atrás
pai
commit
1c7e6ef2dd
1 arquivos alterados com 0 adições e 6 exclusões
  1. 0 6
      pyrat-data-forbidden-genotypes.csv

+ 0 - 6
pyrat-data-forbidden-genotypes.csv

@@ -5,15 +5,9 @@ ID-003,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,Tg,Mut-B,Tg,,,Mu
 ID-004,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/+,Mut-B,-/-,,,Mut-A,het,Mut-B,het,,,Mut-A,het,Mut-B,het,,
 ID-005,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,het,,,Mut-A,+/+,Mut-B,+/+,,,Mut-A,-/-,Mut-B,-/-,,
 ID-006,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/ko,,,Mut-A,ko/ko,Mut-B,het,,,Mut-A,wt,Mut-B,ko/ko,,
-<<<<<<< HEAD
-ID-007,,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/ki,,,Mut-A,ki/ki,Mut-B,het,,,Mut-A,wt,Mut-B,ki/ki,,
-ID-008,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/+,,,Mut-A,ko/-,Mut-B,het,,,Mut-A,-/ko,Mut-B,+/ko,,
-ID-009,,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/+,,,Mut-A,ki/-,Mut-B,het,,,Mut-A,-/ki,Mut-B,+/ki,,
-=======
 ID-007,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ki/ki,,,Mut-A,ki/ki,Mut-B,het,,,Mut-A,wt,Mut-B,ki/ki,,
 ID-008,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/-,Mut-B,ko/+,,,Mut-A,ko/-,Mut-B,het,,,Mut-A,-/ko,Mut-B,+/ko,,
 ID-009,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,-/+,Mut-B,ki/+,,,Mut-A,ki/-,Mut-B,het,,,Mut-A,-/ki,Mut-B,+/ki,,
->>>>>>> master
 ID-010,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,het,Mut-B,ko/+,,,Mut-A,ko/ko,Mut-B,het,,,Mut-A,wt,Mut-B,+/+,,
 ID-011,m,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,+/-,Mut-B,,,,Mut-A,+/-,Mut-B,het,,,Mut-A,het,Mut-B,het,,
 ID-012,f,Line-AB,15/12/2025,ID-F1,ID-M1,End of experiment,Mut-A,,Mut-B,,,,Mut-A,hom,Mut-B,het,,,Mut-A,wt,Mut-B,hom,,