lib/gameball/utils/helper.rb in alphaSDK-0.2.4 vs lib/gameball/utils/helper.rb in alphaSDK-0.2.5

@@ -29,10 +29,14 @@
       begin
         body[:transactionTime] = transactionTime.iso8601
       rescue NoMethodError => exception
         raise Gameball::GameballError.new("Invalid Date Formate, Please use Date and Time objects")
       end
+<<<<<<< HEAD
+      body["bodyHashed"] = Gameball::Utils::hashBody(playerUniqueId: playerUniqueId, amount: (amount || ""), transactionTime: (transactionTime || ""))
+=======
       body["hash"] = Gameball::Utils::hashBody(playerUniqueId: playerUniqueId, amount: (amount || ""), transactionTime: (transactionTime || ""))
+>>>>>>> aece124df52cb5113b88b74b8e8eb5c68bec89ef
       body
     end
   end
 end