WTF

2025-05-15 22:21:33 +04:00 · 2025-05-15 22:21:33 +04:00 · 307095bfd0
commit 307095bfd0
parent ae7291d4f1
1 changed files with 0 additions and 3 deletions
--- 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)