Merge branch 'release/0.6.0'

SANSA-Stack · Jul 2, 2019 · 84c40de · 84c40de
2 parents fd7b933 + 54a9d8d
commit 84c40de
Show file tree

Hide file tree

Showing 5 changed files with 162 additions and 557 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 
 pom.xml.versionsBackup
 
+*.bak
+
 # sbt specific
 .cache
 .history
@@ -21,5 +23,17 @@ project/plugins/project/
 *.iml
 *.swp
 
+# eclipse conf file
+.settings
+.classpath
+.project
+.manager
+.scala_dependencies
+.cashe
+.cache-main
+.cache-tests
+.classpath
+
+
 # Scala style checker
 */scalastyle-output.xml