This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch ignite-11880 in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
commit d90716a25a7e0a96b5c06dbef6d4987d146b8336 Merge: b3ee3ec 0b74e34 Author: Dmitriy Pavlov <[email protected]> AuthorDate: Sun Jun 2 01:23:00 2019 +0300 Merge branch 'master' into ignite-11880 # Conflicts: # ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/NotificationChannel.java .../java/org/apache/ignite/ci/tcbot/conf/NotificationChannel.java | 3 ++- tcbot-common/build.gradle | 1 - tcbot-server/README.md | 3 +++ {tcbot-teamcity => tcbot-teamcity-ignited}/build.gradle | 7 +------ tcbot-teamcity/README.md | 3 +++ tcbot-teamcity/build.gradle | 1 - 6 files changed, 9 insertions(+), 9 deletions(-)
