From 2331203f534e172305b909f62cd02c706b583e3b Mon Sep 17 00:00:00 2001
From: Olivier DOSSMANN <git@dossmann.net>
Date: Mon, 3 Feb 2020 21:16:20 +0100
Subject: [PATCH] =?UTF-8?q?ZSH:=20probl=C3=A8me=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .zshrc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.zshrc b/.zshrc
index 2e55eef..d4ba79c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -68,11 +68,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-<<<<<<< HEAD
-plugins=(git httpie ng npm nvm pass pip pyenv sudo virtualenvwrapper wd)
-=======
 plugins=(git httpie ng npm nvm pass pip pyenv sudo wd)
->>>>>>> 3be7111b37ae91585798c3e046fc8cf9f9cceb0e
 
 source $ZSH/oh-my-zsh.sh