From 83ffd37a3720eafc7d7b48308f0b1e93c1b61f4d Mon Sep 17 00:00:00 2001
From: rileyrg <rileyrg@gmx.de>
Date: Mon, 16 Sep 2024 13:12:22 +0200
Subject: [PATCH] correcting screwups... rusty

---
 DotFiles/.syncrclone/excludes.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/DotFiles/.syncrclone/excludes.txt b/DotFiles/.syncrclone/excludes.txt
index a28b39d..388bb22 100644
--- a/DotFiles/.syncrclone/excludes.txt
+++ b/DotFiles/.syncrclone/excludes.txt
@@ -6,8 +6,5 @@
 - hexchat/logs/**
 - hexchat/scrollback/**
 - cache/**
-<<<<<<< Updated upstream
-=======
 - rclone/rclone.conf
 - .syncrclone/logs/**
->>>>>>> Stashed changes