From b16c6cf2ae1349b9dcecdb13178b2ab715125964 Mon Sep 17 00:00:00 2001
From: Christoph <606567+monochromec@users.noreply.github.com>
Date: Wed, 29 May 2024 00:06:24 +0200
Subject: [PATCH] Added Tor talk slides

---
 vor.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vor.txt b/vor.txt
index 33678f1..8ac6c23 100644
--- a/vor.txt
+++ b/vor.txt
@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 | Tor-Projekt-Update  [Folien](/talks/FraLUG_Tor_2024.pdf)| Ben + Christoph |
-=======
->>>>>>> refs/remotes/origin/master
 | Min. DNS auf Basis von bind9 | Helmut |
 | DHCP + DDNS | Helmut |
 | Smart Home mit Open Source System OpenHab | Andreas |