Merge branch 'master' of https://github.com/jpeng-go/plugin

# Conflicts: # build/dapp-test-common.sh

Merge branch 'master' of https://github.com/jpeng-go/plugin
2ca56fdf · pengjun · 85da1d4f · bedad8b8 · 2ca56fdf
Commit 2ca56fdf authored May 31, 2019 by pengjun
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

dapp-test-common.sh build/dapp-test-common.sh +1 -2

No files found.
--- a/build/dapp-test-common.sh
+++ b/build/dapp-test-common.sh
@@ -107,4 +107,4 @@ chain33_SignRawTx() {
    else
        echo "signedTx null error"
    fi
-}
\ No newline at end of file
+}