Skip to content

Commit f6b13a5

Browse files
davidzchendavidzchen
committed
Resolve merge conflicts.
2 parents b148d3f + a5db6e2 commit f6b13a5

File tree

6 files changed

+350
-270
lines changed

6 files changed

+350
-270
lines changed

‎.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@ dist/
22
build/
33
.idea/
44
*.iml
5+
*.log
6+
TestProcess_*
7+
_AzkabanTestDir_*
8+
reports/

0 commit comments

Comments
 (0)