From bec90e92026e93ed411ea1131af9f572592a8b61 Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Wed, 24 Jan 2024 17:42:57 +0100
Subject: [PATCH] Fix conflict not resolve
---
content/3.defense-systems/gaps6.md | 5 -----
1 file changed, 5 deletions(-)
diff --git a/content/3.defense-systems/gaps6.md b/content/3.defense-systems/gaps6.md
index 6e4bdbd3..22188f4c 100644
--- a/content/3.defense-systems/gaps6.md
+++ b/content/3.defense-systems/gaps6.md
@@ -16,7 +16,6 @@ relevantAbstract:
## Description
-<<<<<<< content/3.defense-systems/gaps6.md
GAPS (GMT-encoded Anti-Phage System) antiphage systems were discovered on newly described Gamma-Mobile-Trio elements.
GAPS6 is composed of two proteins, [GAPS6a](https://www.ncbi.nlm.nih.gov/protein/WP_248387294.1/) and [GAPS6b](https://www.ncbi.nlm.nih.gov/protein/WP_248387295.1/). These two proteins are encoded together in diverse Gram-negative bacteria.
@@ -91,7 +90,3 @@ end
style Title3 fill:none,stroke:none,stroke-width:none
style Title4 fill:none,stroke:none,stroke-width:none
</mermaid>
-<<<<<<< content/3.defense-systems/gaps6.md
-=======
-
->>>>>>> content/3.defense-systems/gaps6.md
--
GitLab