Fixed merge conflict.
authorSlava Koptilin <slava.koptilin@gmail.com>
Wed, 13 Jan 2021 13:15:11 +0000 (16:15 +0300)
committerSlava Koptilin <slava.koptilin@gmail.com>
Wed, 13 Jan 2021 13:15:11 +0000 (16:15 +0300)
commit2759b125ef0e1c7bcd25ac44d2bc7438c73dcd24
tree1750d3f42906bb20ee0e81e6d30cd85e8757de56
parent0b493bee998a32e771cf2bf7096f2250ed40c13a
Fixed merge conflict.
tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/TcBotEngineModule.java