Skip to content
Snippets Groups Projects
Commit bec90e92 authored by Remi PLANEL's avatar Remi PLANEL
Browse files

Fix conflict not resolve

parent da24c5c3
No related branches found
No related tags found
No related merge requests found
Pipeline #121853 waiting for manual action with stages
Stage:
    Stage:
      Stage:
        Stage:
          Stage:
            Stage:
              Stage:
                Stage:
                  Stage:
                    in 7 minutes and 59 seconds
                    Hide whitespace changes
                    Inline Side-by-side
                    content/3.defense-systems/gaps6.md
                    + 0
                    − 5
                    View file @ bec90e92
                    ...@@ -16,7 +16,6 @@ relevantAbstract: ...@@ -16,7 +16,6 @@ relevantAbstract:
                    ## Description ## Description
                    <<<<<<< content/3.defense-systems/gaps6.md
                    GAPS (GMT-encoded Anti-Phage System) antiphage systems were discovered on newly described Gamma-Mobile-Trio elements. 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. 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 ...@@ -91,7 +90,3 @@ end
                    style Title3 fill:none,stroke:none,stroke-width:none style Title3 fill:none,stroke:none,stroke-width:none
                    style Title4 fill:none,stroke:none,stroke-width:none style Title4 fill:none,stroke:none,stroke-width:none
                    </mermaid> </mermaid>
                    <<<<<<< content/3.defense-systems/gaps6.md
                    =======
                    >>>>>>> content/3.defense-systems/gaps6.md
                    0% or .
                    You are about to add 0 people to the discussion. Proceed with caution.
                    Finish editing this message first!
                    Please register or to comment