Skip to content

Commit

Permalink
Merge pull request #13 from mumianhua/develop
Browse files Browse the repository at this point in the history
y9
  • Loading branch information
sophiawangTron authored Nov 21, 2023
2 parents 7dc27f7 + 3f26434 commit f94c58f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pullrequesttarget_wrong.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Buildkite
name: wrong

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setstatus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "SetStatus"
on:
push:
branches: [ 'develop', 'master', 'release_**' ]
pull_request:
pull_request_target:
# The branches below must be a subset of the branches above
branches: [ 'develop' ]

Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/tron/common/utils/ByteArray.java
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static byte[] fromObject(Object obj) {
objectOutputStream.flush();
bytes = byteArrayOutputStream.toByteArray();
} catch (IOException e) {
logger.error("objectToByteArray failed: " + e.getMessage(), e);
logger.error("objectToByteArray fffailed: " + e.getMessage(), e);
}
return bytes;
}
Expand Down

0 comments on commit f94c58f

Please sign in to comment.