From 394a9b98e57b4f718ec9500e4c254fe384cb0586 Mon Sep 17 00:00:00 2001
From: fauguste <frederic.auguste@gmail.com>
Date: Sat, 24 Nov 2018 00:01:00 +0100
Subject: [PATCH] fix git merge menu

---
 pages/git/merge.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pages/git/merge.md b/pages/git/merge.md
index 34e1028..74152fe 100644
--- a/pages/git/merge.md
+++ b/pages/git/merge.md
@@ -1,14 +1,11 @@
 ---
-# Feel free to add content and custom Front Matter to this file.
-# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults
-
 layout: default
 permalink: /git/merge/
 tags: git
 description: Mise à jour d'une branche à partir du master.
 
-title: Basics
-menus: git merge
+title: Merge
+menus: git
 ---
 ## Merge