Commit 4e0aed8
committed
Merge commit 'a20f71001'
Conflicts:
.github/workflows/ci.yml
build.sbt
docs-gen/src/main/scala/bloop/Docs.scala
docs-gen/src/main/scala/bloop/docs/Sonatype.scala
docs/build-tools/gradle.md
docs/contributing-guide.md
project/BuildPlugin.scala
project/Dependencies.scala1 file changed
+1
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
156 | 157 | | |
157 | 158 | | |
158 | 159 | | |
159 | | - | |
160 | | - | |
161 | 160 | | |
162 | 161 | | |
163 | 162 | | |
| |||
0 commit comments