mirror of https://github.com/sbt/sbt.git
Conflicts: project/build.properties project/packaging.scala |
||
|---|---|---|
| .. | ||
| project | ||
| build.properties | ||
| build.scala | ||
| packaging.scala | ||
Conflicts: project/build.properties project/packaging.scala |
||
|---|---|---|
| .. | ||
| project | ||
| build.properties | ||
| build.scala | ||
| packaging.scala | ||