From 307095bfd035131b875e10d00403a8a6bc7d51e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A2u=20Cao?= <raucao@kosmos.org>
Date: Thu, 15 May 2025 22:21:33 +0400
Subject: [PATCH] WTF

---
 app/jobs/xmpp_set_avatar_job.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/jobs/xmpp_set_avatar_job.rb b/app/jobs/xmpp_set_avatar_job.rb
index d2f8d23..642225c 100644
--- a/app/jobs/xmpp_set_avatar_job.rb
+++ b/app/jobs/xmpp_set_avatar_job.rb
@@ -57,10 +57,7 @@ class XmppSetAvatarJob < ApplicationJob
       end
     end
 
-<<<<<<< HEAD
-=======
     # See https://xmpp.org/extensions/xep-0084.html
->>>>>>> feature/ejabberd_pep
     def build_xep0084_stanzas
       img_data    = process_avatar
       sha1_hash   = Digest::SHA1.hexdigest(img_data)