mergin with branch beta

This commit is contained in:
Miriam Baglioni 2022-01-12 17:29:37 +01:00
commit 4d517ed9ec
2 changed files with 2 additions and 2 deletions

2
.gitignore vendored
View File

@ -25,4 +25,4 @@ spark-warehouse
/**/job-override.properties /**/job-override.properties
/**/*.log /**/*.log
/**/.factorypath /**/.factorypath
/**/.scalafmt.conf

View File

@ -681,7 +681,7 @@
<groupId>org.antipathy</groupId> <groupId>org.antipathy</groupId>
<artifactId>mvn-scalafmt_2.11</artifactId> <artifactId>mvn-scalafmt_2.11</artifactId>
<configuration> <configuration>
<configLocation>dhp-build/dhp-code-style/src/main/resources/scalafmt/scalafmt.conf</configLocation> <configLocation>https://code-repo.d4science.org/D-Net/dnet-hadoop/raw/branch/beta/dhp-build/dhp-code-style/src/main/resources/scalafmt/scalafmt.conf</configLocation>
<skipTestSources>false</skipTestSources> <skipTestSources>false</skipTestSources>
<skipSources>false</skipSources> <skipSources>false</skipSources>
<sourceDirectories> <sourceDirectories>