From 7943af3d11dc9069683f2827f9e17de8401628ad Mon Sep 17 00:00:00 2001
From: Arnaud Morin <arnaud.morin@ovhcloud.com>
Date: Thu, 13 Jan 2022 14:43:28 +0100
Subject: [PATCH] Add conflict

---
 git/{trainings => training}/1-git-conflict.md | 0
 index.html                                    | 3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename git/{trainings => training}/1-git-conflict.md (100%)

diff --git a/git/trainings/1-git-conflict.md b/git/training/1-git-conflict.md
similarity index 100%
rename from git/trainings/1-git-conflict.md
rename to git/training/1-git-conflict.md
diff --git a/index.html b/index.html
index 16d0e3a..41c5c38 100644
--- a/index.html
+++ b/index.html
@@ -26,7 +26,8 @@
       <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/' target='_blank'>Cours</a></p>
       <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/git/Arnaud%20Morin%20-%20Git%20Cheat%20Sheet.pdf' target='_blank'>Cheat Sheet</a></p>
       <p><a class="btn btn-primary btn-lg" href='https://github.com/jlord/git-it-electron/releases' target='_blank'>TP1 - Git-it</a></p>
-      <p>(<a class="btn btn-primary btn-lg" href='https://learngitbranching.js.org/' target='_blank'>Optional TP2 - Learn Git Branching</a>)</p>
+      <p><a class="btn btn-primary btn-lg" href='https://learngitbranching.js.org/' target='_blank'>TP2 - Learn Git Branching</a></p>
+      <p><a class="btn btn-primary btn-lg" href='https://github.com/arnaudmorin/trainings/tree/main/git/training/' target='_blank'>TP3 - Git conflicts</a></p>
   
       <h1>Docker</h1>
       <p><a class="btn btn-primary btn-lg" href='https://www.arnaudmorin.fr/trainings/docker/slides/' target='_blank'>Cours</a></p>