From c8cf08e431cde1ed8e110a5abc0396c836cb2835 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <alicia@omg.lol>
Date: Tue, 1 Nov 2022 13:22:47 +0000
Subject: [PATCH] Rebase

---
 zsh/aliases/node-js.zsh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/zsh/aliases/node-js.zsh b/zsh/aliases/node-js.zsh
index 43da4c0..456b758 100644
--- a/zsh/aliases/node-js.zsh
+++ b/zsh/aliases/node-js.zsh
@@ -71,11 +71,7 @@ print_node_versions () {
   versions=''
   get_version () {
     if hash $1 2> /dev/null || command -v $1 >/dev/null; then
-<<<<<<< Updated upstream
       versions="$versions\e[36m\e[1m $2: \033[0m$($1 --version)\n\033[0m"
-=======
-      versions="$versions\e[36m\e[1m $2: \033[0m$($1 --version)\n"
->>>>>>> Stashed changes
     else
       versions="$versions\e[33m\e[1m $2: \033[0m\033[3m Not installed\n\033[0m"
     fi