From 9aa9c66488793ef2a997c573fbab31cbd64b8659 Mon Sep 17 00:00:00 2001
From: Kilobyte22 <stiepen22@gmx.de>
Date: Mon, 27 Jul 2015 23:26:49 +0200
Subject: [PATCH] Fixed an artifact from merge and some bugs in agnoster theme

For some reason i forgot to save the file in my editor, leading to the code not working. Luckily i looked through the changed files on github again and i found this. This is what happens if you don't care to actually test your code for once
Due to some more lack of testing i totall missed that my earlier fix did not work. This is now really fixed. (i should not write code when tired.)
---
 themes/agnoster.zsh-theme | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme
index 6b3739568..ab666621d 100644
--- a/themes/agnoster.zsh-theme
+++ b/themes/agnoster.zsh-theme
@@ -189,13 +189,8 @@ prompt_hg() {
       if `hg st | grep -q "^\?"`; then
         prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
         st='±'
-<<<<<<< HEAD
-      elif `hg st | grep -q "^(M|A)"`; then
-        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
-=======
       elif `hg st | grep -q "^[MA]"`; then
-        prompt_segment yellow black
->>>>>>> a207a38d634cc10441636bc4359cd8a18c502dea
+        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
         st='±'
       else
         prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"