# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1404276258 14400
# Node ID 5cef3c403c1ee4562f8b7857988897a3226c645f
# Parent  2608cb00d211afeb6bc551fb3e81151460a15b2b# Parent  ed9cc9675e93d3d7491314f84cec44d5a57098b1
Merge from default

diff --git a/.zshrc b/.zshrc
--- a/.zshrc
+++ b/.zshrc
@@ -4,7 +4,7 @@ export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="mhoward"
 ZSH_CUSTOM=~/.oh-my-zsh.cust
 
-plugins=( common-aliases mercurial gitfast )
+plugins=( common-aliases gitfast )
 
 if [ -f ~/.zshrc.local-pre ]; then
   source ~/.zshrc.local-pre