From 8f2e23323f5c9c191e7fa1c5d53dd642f3d78288 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Mon, 3 Apr 2023 11:27:20 -0400
Subject: [PATCH] Auto Update

---
 files/.bashrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/files/.bashrc b/files/.bashrc
index 0d3d2f5..aab41ff 100644
--- a/files/.bashrc
+++ b/files/.bashrc
@@ -29,7 +29,6 @@ export TERM=xterm-color
 # Alias definitions.
 [[ -f ~/.bash_aliases ]] && . ~/.bash_aliases
 
-<<<<<<< HEAD
 # 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"