You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by te...@apache.org on 2020/07/21 12:28:34 UTC

[incubator-streampipes-extensions] 03/03: Merge remote-tracking branch 'origin/dev' into dev

This is an automated email from the ASF dual-hosted git repository.

tex pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-extensions.git

commit d295ebc0f87508d9412d47bac595b4a0b706f1be
Merge: 81de24f 56cbb89
Author: tex <te...@fzi.de>
AuthorDate: Tue Jul 21 14:28:18 2020 +0200

    Merge remote-tracking branch 'origin/dev' into dev

 .../connect/adapters/plc4x/modbus/Plc4xModbusAdapter.java         | 8 ++++----
 .../streampipes/connect/adapters/plc4x/s7/Plc4xS7Adapter.java     | 8 ++++----
 .../strings.en                                                    | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)