fix merge conflicts

2023-11-03 09:22:09 +05:30 · 2023-11-03 09:22:09 +05:30 · 10e67e4cbb
parent fef31f097f fb7e4a287e
commit 10e67e4cbb
1 changed files with 3 additions and 3 deletions
--- a/ruby/lib/jam_ruby/lib/email_new_musician_match.rb
+++ b/ruby/lib/jam_ruby/lib/email_new_musician_match.rb
@ -65,9 +65,9 @@ module JamRuby
            
            UserMailer.new_musicians_match(user, matched_musician_data).deliver_now 
            
-            #user.update_column(:user_match_email_sent_at, Time.now)
-            #email_sending.sent_user_ids.push(user.id)
-            #email_sending.save!
+            user.update_column(:user_match_email_sent_at, Time.now)
+            email_sending.sent_user_ids.push(user.id)
+            email_sending.save!
          end
        end