Update to v1.5

skrtdev · skrtdev · commit 1c20eb33749d · 2020-10-12T17:37:30.000+02:00
diff --git a/docs/objects.md b/docs/objects.md
@@ -90,11 +90,7 @@ $message->reply([
 // same as
 $message->reply("message_text", [
     "disable_notification" => true
-<<<<<<< HEAD
 ]); // from v1.5
-=======
-]); // from v1.4
->>>>>>> 0e50248f2131b25476747c1c8d1f2d0f839967b1
 ```  
 
 ## Debugging
