From 7fd2f8b53dbf556098026b498167fde3e987c3c9 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 3 Apr 2023 11:28:51 -0400
Subject: [PATCH] Auto Update

---
 files/.bashrc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/files/.bashrc b/files/.bashrc
index aab41ff..6e4219a 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -29,16 +29,11 @@ export TERM=xterm-color
 # Alias definitions.
 [[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
 
-# set PATH so it includes user's private bin if it exists
-[[ -d "$HOME/bin" ]] && PATH+=":$HOME/bin"
-[[ -d "$HOME/.local/bin" ]] && PATH+=":$HOME/.local/bin"
-[[ -d "$HOME/scipts/bin" ]] && PATH+=":$HOME/scripts/bin"
-=======
 # set PATH so it includes certain bin folders if they exist
 [[ -d ~/bin ]] && PATH+=":$HOME/bin"
 [[ -d ~/.local/bin ]] && PATH+=":$HOME/.local/bin"
+[[ -d ~/scipts/bin ]] && PATH+=":$HOME/scripts/bin"
 [[ -d /usr/local/go/bin ]] && PATH+=":/usr/local/go/bin"
->>>>>>> 574ac34e491aaaad429e0df90280e7a0b5e8c7f5
 
 # source misc user scripts
 if [ -d ~/git/dotfiles/source ]; then