From ece8884d12ef112d0956949bdf28fb75afe3e049 Mon Sep 17 00:00:00 2001
From: Martin Dosch <martin@mdosch.de>
Date: Fri, 12 Aug 2022 12:33:51 +0200
Subject: [PATCH] Fix merge.

---
 main.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/main.go b/main.go
index 7c21e5a..d14ee23 100644
--- a/main.go
+++ b/main.go
@@ -81,10 +81,7 @@ func main() {
 		message, user, server, password, resource, alias string
 		oxPrivKey                                        *crypto.Key
 		recipients                                       []recipientsType
-<<<<<<< HEAD
 		groupchat                                        bool
-=======
->>>>>>> master
 	)
 
 	// Define command line flags.