Skip to content

Commit

Permalink
Merge branch 'master' into code_polish
Browse files Browse the repository at this point in the history
  • Loading branch information
DvirDukhan committed Apr 18, 2021
2 parents aec92fb + b9297e8 commit 6666c07
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ hs_err_pid*
.settings/
.pydevproject

*.iml
/.idea/

5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<systemPropertyVariables>
<redis-hosts>${redis-hosts}</redis-hosts>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down

0 comments on commit 6666c07

Please sign in to comment.