From 55034760a1afe0cf7d17aaa2a743ed8fa7c4327f Mon Sep 17 00:00:00 2001
From: Aaron Riedel <git@ar21.de>
Date: Sun, 22 May 2022 04:24:04 +0200
Subject: [PATCH] resolve conflict

---
 .alias | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.alias b/.alias
index 94d520a..5516979 100644
--- a/.alias
+++ b/.alias
@@ -12,6 +12,4 @@ alias so='ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -l roo
 alias mci='docker exec -i mc rcon-cli'
 alias mc='docker exec mc rcon-cli'
 
-alias sa='ssh-agent -k; eval $(ssh-agent) && ssh-add ~/.ssh/*.ed25519'
-
-PATH=$PATH:/usr/games/
+alias sa='ssh-agent -k; eval $(ssh-agent) && ssh-add ~/.ssh/*.ed25519'
\ No newline at end of file