From 029e16065af4c90272a02d775e87e597a6638fc0 Mon Sep 17 00:00:00 2001
From: ftesson <florian.tesson@pasteur.fr>
Date: Wed, 17 Jan 2024 10:50:47 +0100
Subject: [PATCH] change contributors and resolve merge
---
content/3.defense-systems/thoeris.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/content/3.defense-systems/thoeris.md b/content/3.defense-systems/thoeris.md
index 43e92a29..f5060a0c 100644
--- a/content/3.defense-systems/thoeris.md
+++ b/content/3.defense-systems/thoeris.md
@@ -11,7 +11,9 @@ tableColumns:
Effector: Nucleotide modifying
PFAM: PF08937, PF13289, PF18185
contributors:
- - Marie Guillaume, Helena Shomar
+ - Marie Guillaume
+ - Helena Shomar
+ - Florian Tesson
relevantAbstracts:
- doi: 10.1038/s41586-021-04098-7
- doi: 10.1126/science.aar4120
@@ -56,7 +58,6 @@ Proportion of genome encoding the Thoeris system for the 14 phyla with more than
## Structure
-<<<<<<< content/3.defense-systems/thoeris.md
### Experimentaly determined structure
@@ -72,8 +73,6 @@ dataUrls:
---
::
-=======
->>>>>>> content/3.defense-systems/thoeris.md
### Thoeris_I
##### Example 1
--
GitLab