Merge branch 'qualif2020'

WalkingMachine · Nov 5, 2019 · e80f2ed · e80f2ed
2 parents 3d03676 + 2d61be1
commit e80f2ed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/en/publications/index.md b/en/publications/index.md
@@ -8,13 +8,9 @@ ref: publications
 
 ### **Robocup@Home**
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 21b025be9a07e94138539e740ff4d49bb2416763
 #### **Robocup@Home OPL 2020, Bordeaux, France**
   *  Bernatchez, Nicolas. et al. 2020. [Walking Machine @Home OPL 2020 Team Description Paper](https://github.com/WalkingMachine/wm_robocup_tdp/raw/tdp_2020/WalkingMachine_Robocup2020.pdf)
-  *  Qualification video. Youtube. 2020. [video link](https://www.youtube.com/)
+  *  Qualification video. Youtube. 2020. [video link](https://www.youtube.com/watch?v=ZCQ9sAcITKA)
 
 #### **Robocup@Home OPL 2019, Sydney, Australia**
   *  Cousineau, Jeffrey. et al. 2019. [Walking Machine @Home OPL 2019 Team Description Paper](https://github.com/WalkingMachine/wm_robocup_tdp/raw/tdp_2019/WalkingMachine_Robocup2019.pdf)

diff --git a/fr/publications/index.md b/fr/publications/index.md
@@ -10,7 +10,7 @@ ref: publications
 
 #### **Robocup@Home OPL 2020, Bordeaux, France**
   *  Bernatchez, Nicolas. et al. 2020. [Walking Machine @Home OPL 2020 Team Description Paper](https://github.com/WalkingMachine/wm_robocup_tdp/raw/tdp_2020/WalkingMachine_Robocup2020.pdf)
-  *  Vidéo de qualification. Youtube. 2020. [Lien](https://www.youtube.com/)
+  *  Vidéo de qualification. Youtube. 2020. [Lien](https://www.youtube.com/watch?v=ZCQ9sAcITKA)
 
 #### **Robocup@Home OPL 2019, Sydney, Australie**
   *  Cousineau, Jeffrey. et al. 2019. [Walking Machine @Home OPL 2019 Team Description Paper](https://github.com/WalkingMachine/wm_robocup_tdp/raw/tdp_2019/WalkingMachine_Robocup2019.pdf)