From 04c7c28bb67891cad10579eb8ac145bda08ef417 Mon Sep 17 00:00:00 2001
From: Solomon Laing <solomonlaing@protonmail.com>
Date: Mon, 25 Apr 2022 16:00:37 +0930
Subject: [PATCH] added couple of default programs

---
 default-programs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/default-programs b/default-programs
index 5633d9d..068c072 100644
--- a/default-programs
+++ b/default-programs
@@ -115,8 +115,6 @@ neofetch
 sxiv
 MISC_END
 
-<<<<<<< Updated upstream
-
 EXTRAS_START
 i3
 qtile
@@ -137,5 +135,3 @@ rlwrap
 dex
 vicious
 EXTRAS_END
-=======
->>>>>>> Stashed changes