From e7b86f52792cf0754fe465ba4995e984c7685e3f Mon Sep 17 00:00:00 2001
From: Elliott Pardee <me@elliottpardee.me>
Date: Sat, 6 Jun 2015 18:03:37 -0400
Subject: [PATCH] update...

---
 .mkshrc | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.mkshrc b/.mkshrc
index d649d90e..3d068c3e 100755
--- a/.mkshrc
+++ b/.mkshrc
@@ -1,29 +1,14 @@
-# Bins on bins on bins on bins.
 export PATH=$HOME/.go/bin:$HOME/bin:$PATH
 
-<<<<<<< HEAD
 export GOPATH=$HOME/.go
 export GOBIN=$GOPATH/bin
 
 export PS1="─── "
-=======
-# Golang Stuff
-export GOPATH=$HOME/.go
-export GOBIN=$GOPATH/bin
-
-# Preferences
-export PS1="─── "
-export CC=gcc
->>>>>>> 67a80a095d32cd41f01448d90a7e360152f9e4ca
 export EDITOR="vim"
 export VISUAL="vim"
 export MAIL=$HOME/mail/inbox
 
-<<<<<<< HEAD
 alias ls="ls --color=auto"
 alias git="hub"
-=======
-# Laziness
->>>>>>> 67a80a095d32cd41f01448d90a7e360152f9e4ca
 alias ncmpc="ncmpc -c"
 alias sprunge="curl -F 'sprunge=<-' http://sprunge.us"