change actions.py

2017-02-17 00:44:43 +03:00
parent 14d8235208
commit 6b07ab774d
9 changed files with 118963 additions and 123351 deletions
@@ -1,5 +1 @@
-<<<<<<< HEAD
-d4230505429432c8216c89fb4dab5f415aeca34b
-=======
-7ababfff3ab8491e4ab54d5876dd8b44aac0c761
->>>>>>> ad38b38690d46fcce81a7169fbde0aeec6dafa24
+0c206ce3c4e1a4cd27bd0eb2c72c09ff89c0baf0