Resolved conflicts

run.rb

@@ -287,8 +287,8 @@ def send_message(chatid, message_text, imageurl = nil)
     if imageurl != nil
         #Send message with text as html link to image
         print timestamp + ": Sending ............ "
-        message = Telegram::Bot::Client.run(@token) {|bot| message = bot.api.send_message(chat_id: chatid, text: "#{message_text}<a href=\"#{imageurl}\">.</a>", parse_mode: "HTML") }
         STDOUT.flush
+        message = Telegram::Bot::Client.run(@token) {|bot| message = bot.api.send_message(chat_id: chatid, text: "#{message_text}<a href=\"#{imageurl}\">.</a>", parse_mode: "HTML") }
         print "OK\n".green.bold
         STDOUT.flush
         puts "Sent: #{message_text.inspect}\n\n"
@@ -298,8 +298,8 @@ def send_message(chatid, message_text, imageurl = nil)
     else
         #Send a plain-text message
         print timestamp + ": Sending ............ "
-        message = Telegram::Bot::Client.run(@token) {|bot| bot.api.send_message(chat_id: chatid, text: message_text) }
         STDOUT.flush
+        message = Telegram::Bot::Client.run(@token) {|bot| bot.api.send_message(chat_id: chatid, text: message_text) }
         print "OK\n".green.bold
         STDOUT.flush
         puts "Sent: #{message_text.inspect}\n\n"

static_text/patchnotes.txt

@@ -3,7 +3,6 @@ Patch Notes:
 
 v1.0.02
 + Implemented two-part sent message logging (affects server only)
-+ Added /help command (same as /start)
 
 v1.0.01
 + Added /help as an alias for /start