From a1961f87ed5a0f0fa86977c32482c33ebeed81b6 Mon Sep 17 00:00:00 2001 From: cooperl09 Date: Mon, 18 Aug 2025 15:28:40 -0700 Subject: [PATCH] Fixed conflicted changes --- to-associations/to_gene_Oryza_Gramene.assoc | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/to-associations/to_gene_Oryza_Gramene.assoc b/to-associations/to_gene_Oryza_Gramene.assoc index 5467d70..48529d4 100644 --- a/to-associations/to_gene_Oryza_Gramene.assoc +++ b/to-associations/to_gene_Oryza_Gramene.assoc @@ -1977,15 +1977,8 @@ GR_gene GR:0080062 GIF1 TO:0000311 GR_REF:25498 IMP T GRAIN INCOMPLETE FILLING GR_gene GR:0080062 GIF1 TO:0000396 GR_REF:25498 IMP T GRAIN INCOMPLETE FILLING 1 OsCIN2|OsCIN2|LOC_Os04g33740 gene taxon:4530 20121108 Gramene GR_gene GR:0080062 GIF1 TO:0000590 GR_REF:25498 IMP T GRAIN INCOMPLETE FILLING 1 OsCIN2|OsCIN2|LOC_Os04g33740 gene taxon:4530 20121108 Gramene GR_gene GR:0080062 GIF1 TO:0006005 GR_REF:25498 IMP T GRAIN INCOMPLETE FILLING 1 OsCIN2|OsCIN2|LOC_Os04g33740 gene taxon:4530 20121108 Gramene -<<<<<<< Updated upstream GR_gene GR:0080063 SaM TO:0000036 GR_REF:25509 IMP T SaM SaM+|SaM-|SaM+|SaM- gene taxon:4530 20121108 Gramene|TO:cooperl -GR_gene GR:0080063 SaM TO:0000053 GR_REF:25509 IMP T SaM SaM+|SaM-|SaM+|SaM- gene taxon:4530 20121108 Gramene|TO:cooperl -GR_gene GR:0080064 SaF TO:0000036 GR_REF:25509 IMP T SaF SaF+|SaF-|SaF+|SaF- gene taxon:4530 20121108 Gramene|TO:cooperl -GR_gene GR:0080064 SaF TO:0000053 GR_REF:25509 IMP T SaF SaF+|SaF-|SaF+|SaF- gene taxon:4530 20121108 Gramene|TO:cooperl -======= -GR_gene GR:0080063 SaM TO:0000042 GR_REF:25509 IMP T SaM SaM+|SaM- gene taxon:4530 20121108 Gramene GR_gene GR:0080063 SaM TO:0000437 GR_REF:25509 IMP T SaM SaM+|SaM- gene taxon:4530 20121108 Gramene|TO:cooperl -GR_gene GR:0080064 SaF TO:0000042 GR_REF:25509 IMP T SaF SaF+|SaF- gene taxon:4530 20121108 Gramene +GR_gene GR:0080064 SaF TO:0000036 GR_REF:25509 IMP T SaF SaF+|SaF-|SaF+|SaF- gene taxon:4530 20121108 Gramene|TO:cooperl GR_gene GR:0080064 SaF TO:0000437 GR_REF:25509 IMP T SaF SaF+|SaF- gene taxon:4530 20121108 Gramene|TO:cooperl ->>>>>>> Stashed changes GR_gene GR:0090001 SOC1 TO:0000137 GR_REF:0 IMP T SUPPRESSOR OF OVEREXPRESSION OF CO 1 OsSOC1|OsSOC1 gene taxon:4530 20121108 Gramene -- 2.34.1